Merge pull request #3522 from dim/fix-cq-timeout-bug

Consume CQ results on request timeouts
influxdata · Aug 14, 2015 · bb6de3b · bb6de3b
2 parents facba5d + 762a1c6
commit bb6de3b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/services/continuous_querier/service.go b/services/continuous_querier/service.go
@@ -288,6 +288,12 @@ func (s *Service) runContinuousQueryAndWriteResult(cq *ContinuousQuery) error {
 		return err
 	}
 
+	// Drain results
+	defer func() {
+		for _ = range ch {
+		}
+	}()
+
 	// Read all rows from the result channel.
 	for result := range ch {
 		if result.Err != nil {