Skip to content

maintainer: send MaintainerCloseResponse to MaintainerManagerTopic #4643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wk989898 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

maintainer: send MaintainerCloseResponse to MaintainerManagerTopic #4643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion downstreamadapter/dispatcherorchestrator/dispatcher_orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func (m *DispatcherOrchestrator) handleCloseRequest(

log.Info("try close dispatcher manager",
zap.String("changefeed", cfId.String()), zap.Bool("success", response.Success))
return m.sendResponse(from, messaging.MaintainerTopic, response)
return m.sendResponse(from, messaging.MaintainerManagerTopic, response)
}

func createBootstrapResponse(
Expand Down
10 changes: 4 additions & 6 deletions maintainer/maintainer_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ func NewMaintainerManager(
}

mc.RegisterHandler(messaging.MaintainerManagerTopic, m.recvMessages)
mc.RegisterHandler(messaging.MaintainerTopic,
func(ctx context.Context, msg *messaging.TargetMessage) error {
req := msg.Message[0].(*heartbeatpb.MaintainerCloseResponse)
return m.dispatcherMaintainerMessage(ctx, common.NewChangefeedIDFromPB(req.ChangefeedID), msg)
})
return m
}

Expand All @@ -91,13 +86,16 @@ func (m *Manager) recvMessages(ctx context.Context, msg *messaging.TargetMessage
case m.msgCh <- msg:
}
return nil
// receive bootstrap response message from the dispatcher manager
// receive bootstrap response message from the dispatcher manager
case messaging.TypeMaintainerBootstrapResponse:
req := msg.Message[0].(*heartbeatpb.MaintainerBootstrapResponse)
return m.dispatcherMaintainerMessage(ctx, common.NewChangefeedIDFromPB(req.ChangefeedID), msg)
case messaging.TypeMaintainerPostBootstrapResponse:
req := msg.Message[0].(*heartbeatpb.MaintainerPostBootstrapResponse)
return m.dispatcherMaintainerMessage(ctx, common.NewChangefeedIDFromPB(req.ChangefeedID), msg)
case messaging.TypeMaintainerCloseResponse:
req := msg.Message[0].(*heartbeatpb.MaintainerCloseResponse)
return m.dispatcherMaintainerMessage(ctx, common.NewChangefeedIDFromPB(req.ChangefeedID), msg)
// receive heartbeat message from dispatchers
case messaging.TypeHeartBeatRequest:
req := msg.Message[0].(*heartbeatpb.HeartBeatRequest)
Expand Down
2 changes: 1 addition & 1 deletion maintainer/maintainer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func (m *mockDispatcherManager) onDispatchRequest(

func (m *mockDispatcherManager) onMaintainerCloseRequest(msg *messaging.TargetMessage) {
_ = m.mc.SendCommand(messaging.NewSingleTargetMessage(msg.From,
messaging.MaintainerTopic, &heartbeatpb.MaintainerCloseResponse{
messaging.MaintainerManagerTopic, &heartbeatpb.MaintainerCloseResponse{
ChangefeedID: msg.Message[0].(*heartbeatpb.MaintainerCloseRequest).ChangefeedID,
Success: true,
}))
Expand Down
Loading