dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix possible deadlock when output cannot write. (#2610)

This commit is contained in:
Daniel Nelson 2017-03-31 12:45:28 -07:00 committed by GitHub
parent 807c11629f
commit b8bb159a41
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -89,6 +89,7 @@ be deprecated eventually.
- [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier - [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
- [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output - [#2576](https://github.com/influxdata/telegraf/pull/2576): Add write timeout to Riemann output
- [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin - [#2596](https://github.com/influxdata/telegraf/pull/2596): fix timestamp parsing on prometheus plugin
- [#2610](https://github.com/influxdata/telegraf/pull/2610): Fix deadlock when output cannot write
## v1.2.1 [2017-02-01] ## v1.2.1 [2017-02-01]

2
internal/buffer/buffer.go
View File

@ -45,9 +45,11 @@ func (b *Buffer) Add(metrics ...telegraf.Metric) {
select { select {
case b.buf <- metrics[i]: case b.buf <- metrics[i]:
default: default:
b.mu.Lock()
MetricsDropped.Incr(1) MetricsDropped.Incr(1)
<-b.buf <-b.buf
b.buf <- metrics[i] b.buf <- metrics[i]
b.mu.Unlock()
} }
} }
} }