Merge cockroachdb#98551

98551: instancestorage: ensure that the cache goroutine shuts down gracefully r=ajwerner a=ajwerner `(*stop.Stopper).AddCloser` registers a closer to be called after all async tasks have exited. The cache was running, waiting to be closed. We instead need to hook up its context to exit when the stopper is quiescing. Epic: none Release note: None Co-authored-by: ajwerner <[email protected]>
cameronnunez · Mar 14, 2023 · 0205bfe · 0205bfe
2 parents 19e5845 + 1e3c190
commit 0205bfe
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/sql/sqlinstance/instancestorage/instancereader.go b/pkg/sql/sqlinstance/instancestorage/instancereader.go
@@ -78,17 +78,19 @@ func (r *Reader) Start(ctx context.Context, self sqlinstance.InstanceInfo) {
 			timestamp:  hlc.Timestamp{}, // intentionally zero
 		},
 	})
+	// Make sure that the reader shuts down gracefully.
+	ctx, cancel := r.stopper.WithCancelOnQuiesce(ctx)
 	err := r.stopper.RunAsyncTask(ctx, "start-instance-reader", func(ctx context.Context) {
 		cache, err := r.storage.newInstanceCache(ctx)
 		if err != nil {
 			r.setInitialScanDone(err)
 			return
 		}
-		r.stopper.AddCloser(cache)
 		r.setCache(cache)
 		r.setInitialScanDone(nil)
 	})
 	if err != nil {
+		cancel()
 		r.setInitialScanDone(err)
 	}
 }