Skip to content
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

*: fix member race problem #6070

Merged
merged 4 commits into from
Mar 6, 2023
Merged

*: fix member race problem #6070

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dec0bdc
fix member race problem
rleungx Mar 2, 2023
9047907
address the comment
rleungx Mar 2, 2023
f696bce
address the comment
rleungx Mar 2, 2023
63f7b4c
Merge branch 'master' into fix-race9
ti-chi-bot Mar 6, 2023
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
12 changes: 11 additions & 1 deletion server/grpc_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,17 @@ func (s *GrpcServer) wrapErrorToHeader(errorType pdpb.ErrorType, message string)
func (s *GrpcServer) GetMembers(context.Context, *pdpb.GetMembersRequest) (*pdpb.GetMembersResponse, error) {
// Here we purposely do not check the cluster ID because the client does not know the correct cluster ID
// at startup and needs to get the cluster ID with the first request (i.e. GetMembers).
members, err := s.Server.GetMembers()
if s.IsClosed() {
return &pdpb.GetMembersResponse{
Header: &pdpb.ResponseHeader{
Error: &pdpb.Error{
Copy link
Member

Choose a reason for hiding this comment

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

Will the missing cluster ID field be a problem?

Copy link
Member Author

Choose a reason for hiding this comment

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

I distinguish the two situations in the original s.Server.GetMembers().

Type: pdpb.ErrorType_UNKNOWN,
Message: errs.ErrServerNotStarted.FastGenByArgs().Error(),
},
},
}, nil
}
members, err := cluster.GetMembers(s.GetClient())
rleungx marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return &pdpb.GetMembersResponse{
Header: s.wrapErrorToHeader(pdpb.ErrorType_UNKNOWN, err.Error()),
Expand Down