This is an automated cherry-pick of pingcap#9174

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

cdc/owner/changefeed.go

@@ -831,6 +831,10 @@ func (c *changefeed) cleanupMetrics() {
 
 	changefeedBarrierTsGauge.DeleteLabelValues(c.id.Namespace, c.id.ID)
 	c.metricsChangefeedBarrierTsGauge = nil
+
+	if c.isRemoved {
+		changefeedStatusGauge.DeleteLabelValues(c.id.Namespace, c.id.ID)
+	}
 }
 
 // cleanup redo logs if changefeed is removed and redo log is enabled

cdc/processor/processor.go

@@ -912,7 +912,15 @@ func (p *processor) Close() error {
 		zap.String("namespace", p.changefeedID.Namespace),
 		zap.String("changefeed", p.changefeedID.ID))
 
+<<<<<<< HEAD
 	p.sinkManager.stop(p.changefeedID)
+=======
+	// clean up metrics first to avoid some metrics are not cleaned up
+	// when error occurs during closing the processor
+	p.cleanupMetrics()
+
+	p.sinkManager.stop()
+>>>>>>> a6939c3156 (changefeed (ticdc): remove status of a changefeed after it is removed (#9174))
 	p.sinkManager.r = nil
 	p.sourceManager.stop(p.changefeedID)
 	p.sourceManager.r = nil
@@ -949,7 +957,6 @@ func (p *processor) Close() error {
 	// mark tables share the same cdcContext with its original table, don't need to cancel
 	failpoint.Inject("processorStopDelay", nil)
 
-	p.cleanupMetrics()
 	log.Info("processor closed",
 		zap.String("namespace", p.changefeedID.Namespace),
 		zap.String("changefeed", p.changefeedID.ID))