(release/v20.07) Update nextRaftId when starting a node with a raftId…

… > 0. (#6597) (cherry picked from commit a4f21f4)
hypermodeinc · Oct 4, 2020 · 0f2807b · 0f2807b
1 parent 483d3ff
commit 0f2807b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/dgraph/cmd/zero/zero.go b/dgraph/cmd/zero/zero.go
@@ -502,6 +502,9 @@ func (s *Server) Connect(ctx context.Context,
 			m.Id = s.nextRaftId
 			s.nextRaftId += 1
 			proposal.MaxRaftId = m.Id
+		} else if m.Id >= s.nextRaftId {
+			s.nextRaftId = m.Id + 1
+			proposal.MaxRaftId = m.Id
 		}
 
 		// We don't have this member. So, let's see if it has preference for a group.