Fix leak of ticker in remote storage queue manager.

7 years ago · 73dc96e7f5
parent 5ee07b3b3a
commit 73dc96e7f5
2 changed files with 3 additions and 3 deletions
--- a/1
+++ b/1
@ -29,7 +29,6 @@ endif
 STATICCHECK_IGNORE = \
  github.com/prometheus/prometheus/discovery/kubernetes/node.go:SA1019 \
  github.com/prometheus/prometheus/documentation/examples/remote_storage/remote_storage_adapter/main.go:SA1019 \
-  github.com/prometheus/prometheus/storage/remote/queue_manager.go:SA1015 \
  github.com/prometheus/prometheus/pkg/textparse/lex.l.go:SA4006 \
  github.com/prometheus/prometheus/pkg/pool/pool.go:SA6002 \
  github.com/prometheus/prometheus/promql/engine.go:SA6002 \
--- a/storage/remote/queue_manager.go
+++ b/storage/remote/queue_manager.go
@ -293,10 +293,11 @@ func (t *QueueManager) Stop() {
 func (t *QueueManager) updateShardsLoop() {
 	defer t.wg.Done()

-	ticker := time.Tick(shardUpdateDuration)
+	ticker := time.NewTicker(shardUpdateDuration)
+	defer ticker.Stop()
 	for {
 		select {
-		case <-ticker:
+		case <-ticker.C:
 			t.calculateDesiredShards()
 		case <-t.quit:
 			return