Merge pull request #8705 from influxdata/jw-13-backports

Backport #8701
influxdata · Aug 15, 2017 · 14ab24f · 14ab24f
2 parents a010de5 + 5900b10
commit 14ab24f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [#8601](https://github.com/influxdata/influxdb/pull/8601): Fixed time boundaries for continuous queries with time zones.
 - [#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.
+- [#8701](https://github.com/influxdata/influxdb/pull/8701): Fix drop measurement not dropping all data
 
 ## v1.3.3 [2017-08-10]
 

diff --git a/tsdb/engine/tsm1/engine.go b/tsdb/engine/tsm1/engine.go
@@ -1040,11 +1040,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
 }