diff --git a/maintainer/maintainer_controller.go b/maintainer/maintainer_controller.go index 18207cb5b..5f631f9ea 100644 --- a/maintainer/maintainer_controller.go +++ b/maintainer/maintainer_controller.go @@ -104,16 +104,18 @@ func (c *Controller) HandleStatus(from node.ID, statusList []*heartbeatpb.TableS dispatcherID := common.NewDispatcherIDFromPB(status.ID) c.operatorController.UpdateOperatorStatus(dispatcherID, from, status) stm := c.GetTask(dispatcherID) - // it's normal case when the span is not found in replication db - // the span is removed from replication db first, so here we only check if the span status is working or not - if stm == nil && status.ComponentStatus == heartbeatpb.ComponentState_Working { - log.Warn("no span found, remove it", - zap.String("changefeed", c.changefeedID), - zap.String("from", from.String()), - zap.Any("status", status), - zap.String("span", dispatcherID.String())) - // if the span is not found, and the status is working, we need to remove it from dispatcher - _ = c.messageCenter.SendCommand(replica.NewRemoveInferiorMessage(from, c.changefeedID, status.ID)) + if stm == nil { + // it's normal case when the span is not found in replication db + // the span is removed from replication db first, so here we only check if the span status is working or not + if status.ComponentStatus == heartbeatpb.ComponentState_Working { + log.Warn("no span found, remove it", + zap.String("changefeed", c.changefeedID), + zap.String("from", from.String()), + zap.Any("status", status), + zap.String("span", dispatcherID.String())) + // if the span is not found, and the status is working, we need to remove it from dispatcher + _ = c.messageCenter.SendCommand(replica.NewRemoveInferiorMessage(from, c.changefeedID, status.ID)) + } continue } nodeID := stm.GetNodeID() diff --git a/version/version.go b/version/version.go index c78db5756..b2df285d3 100644 --- a/version/version.go +++ b/version/version.go @@ -25,7 +25,7 @@ import ( // Version information. var ( - ReleaseVersion = "None" + ReleaseVersion = "v8.3.0" BuildTS = "None" GitHash = "None" GitBranch = "None"