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

…-22.2-110773 release-22.2: changefeedccl: Fix potential shutdown NPE
cockroachdb · Sep 18, 2023 · ea44a50 · ea44a50
2 parents 5623d8e + 004cb4d
commit ea44a50
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/ccl/changefeedccl/changefeed_processors.go b/pkg/ccl/changefeedccl/changefeed_processors.go
@@ -479,6 +479,11 @@ func (ca *changeAggregator) close() {
 	if ca.Closed {
 		return
 	}
+	if ca.cancel == nil {
+		// consumer close may be called even before Start is called.
+		// If that's the case, cancel is not initialized.
+		return
+	}
 	ca.cancel()
 	// Wait for the poller to finish shutting down.
 	if ca.kvFeedDoneCh != nil {