Merge pull request #87923 from cockroachdb/blathers/backport-release-…

…21.2-87914

release-21.2: kvserver/reports: cancel context on stopper quiescence

pkg/kv/kvserver/reports/reporter.go

@@ -122,9 +122,12 @@ func (stats *Reporter) Start(ctx context.Context, stopper *stop.Stopper) {
 		stats.frequencyMu.interval = ReporterInterval.Get(&stats.settings.SV)
 	})
 	_ = stopper.RunAsyncTask(ctx, "stats-reporter", func(ctx context.Context) {
+		ctx = logtags.AddTag(ctx, "replication-reporter", nil /* value */)
+		ctx, cancel := stopper.WithCancelOnQuiesce(ctx)
+		defer cancel()
+
 		var timer timeutil.Timer
 		defer timer.Stop()
-		ctx = logtags.AddTag(ctx, "replication-reporter", nil /* value */)
 
 		replStatsSaver := makeReplicationStatsReportSaver()
 		constraintsSaver := makeReplicationConstraintStatusReportSaver()
@@ -159,6 +162,8 @@ func (stats *Reporter) Start(ctx context.Context, stopper *stop.Stopper) {
 			case <-timerCh:
 				timer.Read = true
 			case <-changeCh:
+			case <-ctx.Done():
+				return
 			case <-stopper.ShouldQuiesce():
 				return
 			}
@@ -591,6 +596,11 @@ func visitRanges(
 			break
 		}
 
+		// Check for context cancellation.
+		if err := ctx.Err(); err != nil {
+			return err
+		}
+
 		newKey, err := resolver.resolveRange(ctx, &rd, cfg)
 		if err != nil {
 			return err