From 90e2cadeb6af1d77567945383333e28f71453358 Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Tue, 15 Aug 2017 11:19:45 -0600 Subject: [PATCH 1/2] Fix drop measurement not dropping all data If there were multiple shards, drop measurement could update the index and remove the measurement before the other shards ran their deletes. This causes the later shards to not see any series to delete. The fix is to all deleteSeries to handle the index delete which already accounts for removing the measurement when it is fully removed from the index. --- tsdb/engine/tsm1/engine.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tsdb/engine/tsm1/engine.go b/tsdb/engine/tsm1/engine.go index 02b1b31f0b1..1492ab21563 100644 --- a/tsdb/engine/tsm1/engine.go +++ b/tsdb/engine/tsm1/engine.go @@ -1046,11 +1046,6 @@ func (e *Engine) deleteMeasurement(name []byte) error { return err } } - - // Remove the measurement from the index. - if err := e.index.DropMeasurement(name); err != nil { - return err - } return nil } From 21f6ed2c2efe2313434bce1f3c072e448c2f40b3 Mon Sep 17 00:00:00 2001 From: Jason Wilder Date: Tue, 15 Aug 2017 12:03:01 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d315cb9ac3..1073c1ac9d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,12 @@ - [#8607](https://github.com/influxdata/influxdb/issues/8607): Fix time zone shifts when the shift happens on a time zone boundary. - [#8639](https://github.com/influxdata/influxdb/issues/8639): Parse time literals using the time zone in the select statement. +## v1.3.4 [unreleased] + +### Bugfixes + +- [#8701](https://github.com/influxdata/influxdb/pull/8701): Fix drop measurement not dropping all data + ## v1.3.3 [unreleased] ### Bugfixes