Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8580 from influxdata/sgc-8500-deadlock 

Free RLock prior to returning
pull/8579/head
Stuart Carnie 2017-07-10 09:26:34 -07:00 committed by GitHub
parent dba3ce1a42 649beba8b3
commit 05f9977295
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

@ -23,6 +23,7 @@
### Bugfixes ### Bugfixes
- [#8559](https://github.com/influxdata/influxdb/issues/8559): Ensure temporary TSM files get cleaned up when compaction aborted. - [#8559](https://github.com/influxdata/influxdb/issues/8559): Ensure temporary TSM files get cleaned up when compaction aborted.
- [#8500](https://github.com/influxdata/influxdb/issues/8500): InfluxDB goes unresponsive
## v1.3.0 [2017-06-21] ## v1.3.0 [2017-06-21]

2
tsdb/index/inmem/meta.go
View File

@ -330,11 +330,13 @@ func (m *Measurement) TagSets(shardID uint64, opt influxql.IteratorOptions) ([]*
// Abort if the query was killed // Abort if the query was killed
select { select {
case <-opt.InterruptCh: case <-opt.InterruptCh:
m.mu.RUnlock()
return nil, influxql.ErrQueryInterrupted return nil, influxql.ErrQueryInterrupted
default: default:
} }
if opt.MaxSeriesN > 0 && seriesN > opt.MaxSeriesN { if opt.MaxSeriesN > 0 && seriesN > opt.MaxSeriesN {
m.mu.RUnlock()
return nil, fmt.Errorf("max-select-series limit exceeded: (%d/%d)", seriesN, opt.MaxSeriesN) return nil, fmt.Errorf("max-select-series limit exceeded: (%d/%d)", seriesN, opt.MaxSeriesN)
} }