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

Jump to bottom

mcs: fix panic of get leader #7472

Merged
merged 2 commits into from
Dec 7, 2023
Merged

mcs: fix panic of get leader #7472

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f82a0cd
fix panic of get leader
rleungx Nov 29, 2023
e3d35c4
Merge branch 'master' into stable-test18
ti-chi-bot Dec 7, 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
16 changes: 3 additions & 13 deletions pkg/member/participant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,16 @@ func (m *Participant) Client() *clientv3.Client {
// IsLeader returns whether the participant is the leader or not by checking its leadership's
// lease and leader info.
func (m *Participant) IsLeader() bool {
if m.GetLeader() == nil {
return false
}
return m.leadership.Check() && m.GetLeader().GetId() == m.member.GetId() && m.campaignCheck()
}

// IsLeaderElected returns true if the leader exists; otherwise false
func (m *Participant) IsLeaderElected() bool {
return m.GetLeader() != nil
return m.GetLeader().GetId() != 0
}

// GetLeaderListenUrls returns current leader's listen urls
func (m *Participant) GetLeaderListenUrls() []string {
if m.GetLeader() == nil {
return nil
}
return m.GetLeader().GetListenUrls()
}

Expand All @@ -149,13 +143,9 @@ func (m *Participant) GetLeaderID() uint64 {
func (m *Participant) GetLeader() participant {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to cherry pick it?

leader := m.leader.Load()
if leader == nil {
return nil
}
member := leader.(participant)
if member.GetId() == 0 {
return nil
return NewParticipantByService(m.serviceName)
}
return member
return leader.(participant)
}

// setLeader sets the member's leader.
Expand Down
Loading