Skip to content

dm: add retry for dm-worker to join dm-master #11701

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

Merged
ti-chi-bot merged 1 commit into from
Oct 29, 2024
Merged

dm: add retry for dm-worker to join dm-master #11701

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
81 changes: 44 additions & 37 deletions dm/worker/join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import (
"google.golang.org/grpc/credentials"
)

const retryTimes = 5
Copy link
Copy Markdown
Contributor

@Benjamin2037 Benjamin2037 Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is retry interval wait a while between two tries.


// GetJoinURLs gets the endpoints from the join address.
func GetJoinURLs(addrs string) []string {
// TODO: handle pm1=xxxx:1234,pm2=xxxx:1234,pm3=xxxx:1234
Expand Down Expand Up @@ -63,46 +65,51 @@ func (s *Server) JoinMaster(endpoints []string) error {
}

var errorStr string
for _, endpoint := range endpoints {
ctx1, cancel1 := context.WithTimeout(ctx, 3*time.Second)
//nolint:staticcheck
conn, err := grpc.DialContext(
ctx1,
utils.UnwrapScheme(endpoint),
grpc.WithBlock(),
grpcTLS,
grpc.WithBackoffMaxDelay(3*time.Second),
)
cancel1()
if err != nil {
if conn != nil {
conn.Close()
// retry to connect master
for i := 0; i < retryTimes; i++ {
Copy link
Copy Markdown
Contributor

@lance6716 lance6716 Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to update the comments at line 58

for _, endpoint := range endpoints {
ctx1, cancel1 := context.WithTimeout(ctx, 3*time.Second)
//nolint:staticcheck
conn, err := grpc.DialContext(
ctx1,
utils.UnwrapScheme(endpoint),
grpc.WithBlock(),
grpcTLS,
grpc.WithBackoffMaxDelay(3*time.Second),
)
cancel1()
if err != nil {
if conn != nil {
conn.Close()
}
log.L().Error("fail to dial dm-master", zap.String("endpoint", endpoint), zap.Error(err))
errorStr = err.Error()
continue
}
client := pb.NewMasterClient(conn)
ctx1, cancel1 = context.WithTimeout(ctx, 3*time.Second)
resp, err := client.RegisterWorker(ctx1, req)
cancel1()
conn.Close()
if err != nil {
log.L().Error("fail to register worker", zap.String("endpoint", endpoint), zap.Error(err))
errorStr = err.Error()
continue
}
if !resp.GetResult() {
log.L().Error("fail to register worker", zap.String("endpoint", endpoint), zap.String("error", resp.Msg))
errorStr = resp.Msg
continue
}
log.L().Error("fail to dial dm-master", zap.String("endpoint", endpoint), zap.Error(err))
errorStr = err.Error()
continue
}
client := pb.NewMasterClient(conn)
ctx1, cancel1 = context.WithTimeout(ctx, 3*time.Second)
resp, err := client.RegisterWorker(ctx1, req)
cancel1()
conn.Close()
if err != nil {
log.L().Error("fail to register worker", zap.String("endpoint", endpoint), zap.Error(err))
errorStr = err.Error()
continue
}
if !resp.GetResult() {
log.L().Error("fail to register worker", zap.String("endpoint", endpoint), zap.String("error", resp.Msg))
errorStr = resp.Msg
continue
}

// worker do calls decrypt, but the password is decrypted already,
// but in case we need it later, init it.
encrypt.InitCipher(resp.GetSecretKey())
// worker do calls decrypt, but the password is decrypted already,
// but in case we need it later, init it.
encrypt.InitCipher(resp.GetSecretKey())

return nil
return nil
}
log.L().Warn("retry to connect master", zap.Int("retry", i+1), zap.Int("total", retryTimes))
time.Sleep(retryConnectSleepTime)
}
return terror.ErrWorkerFailConnectMaster.Generate(endpoints, errorStr)
}
Expand Down