Merge pull request influxdata#6920 from influxdata/js-6909-log-cq-exe…

…cution-time Log the CQ execution time when continuous query logging is enabled
oldmantaiter · Jul 21, 2016 · 92825b4 · 92825b4
2 parents e3ecbf0 + 4bdf575
commit 92825b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ With this release the systemd configuration files for InfluxDB will use the syst
 - [#1110](https://github.com/influxdata/influxdb/issues/1110): Support loading a folder for collectd typesdb files.
 - [#6928](https://github.com/influxdata/influxdb/issues/6928): Run continuous query for multiple buckets rather than one per bucket.
 - [#5500](https://github.com/influxdata/influxdb/issues/5500): Add extra trace logging to tsm engine.
+- [#6909](https://github.com/influxdata/influxdb/issues/6909): Log the CQ execution time when continuous query logging is enabled.
 
 ### Bugfixes
 

diff --git a/services/continuous_querier/service.go b/services/continuous_querier/service.go
@@ -324,15 +324,21 @@ func (s *Service) ExecuteContinuousQuery(dbi *meta.DatabaseInfo, cqi *meta.Conti
 		return err
 	}
 
+	var start time.Time
 	if s.loggingEnabled {
 		s.Logger.Printf("executing continuous query %s (%v to %v)", cq.Info.Name, startTime, endTime)
+		start = time.Now()
 	}
 
 	// Do the actual processing of the query & writing of results.
 	if err := s.runContinuousQueryAndWriteResult(cq); err != nil {
 		s.Logger.Printf("error: %s. running: %s\n", err, cq.q.String())
 		return err
 	}
+
+	if s.loggingEnabled {
+		s.Logger.Printf("finished continuous query %s (%v to %v) in %s", cq.Info.Name, startTime, endTime, time.Now().Sub(start))
+	}
 	return nil
 }