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

(release/v20.03) Avoid assigning duplicate RAFT IDs to new nodes #5604

Merged
merged 1 commit into from
Jun 9, 2020
Merged

(release/v20.03) Avoid assigning duplicate RAFT IDs to new nodes #5604

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
1 change: 1 addition & 0 deletions dgraph/cmd/zero/raft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ func (n *node) applyProposal(e raftpb.Entry) (string, error) {
return p.Key, errInvalidProposal
}
state.MaxRaftId = p.MaxRaftId
n.server.nextRaftId = x.Max(n.server.nextRaftId, p.MaxRaftId+1)
}
if p.SnapshotTs != nil {
for gid, ts := range p.SnapshotTs {
Expand Down
11 changes: 10 additions & 1 deletion dgraph/cmd/zero/zero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type Server struct {

NumReplicas int
state *pb.MembershipState
nextRaftId uint64

nextLeaseId uint64
nextTxnTs uint64
Expand Down Expand Up @@ -83,6 +84,7 @@ func (s *Server) Init() {
Groups: make(map[uint32]*pb.Group),
Zeros: make(map[uint64]*pb.Member),
}
s.nextRaftId = 1
s.nextLeaseId = 1
s.nextTxnTs = 1
s.nextGroup = 1
Expand Down Expand Up @@ -217,7 +219,10 @@ func (s *Server) hasLeader(gid uint32) bool {
func (s *Server) SetMembershipState(state *pb.MembershipState) {
s.Lock()
defer s.Unlock()

s.state = state
s.nextRaftId = x.Max(s.nextRaftId, s.state.MaxRaftId+1)

if state.Zeros == nil {
state.Zeros = make(map[uint64]*pb.Member)
}
Expand Down Expand Up @@ -491,7 +496,11 @@ func (s *Server) Connect(ctx context.Context,
}
}
if m.Id == 0 {
m.Id = s.state.MaxRaftId + 1
// In certain situations, the proposal can be sent and return with an error.
// However, Dgraph will keep retrying the proposal. To avoid assigning duplicating
// IDs, the couter is incremented every time a proposal is created.
m.Id = s.nextRaftId
s.nextRaftId += 1
proposal.MaxRaftId = m.Id
}

Expand Down