(release/v20.07) Update nextRaftId when starting a node with a raftId > 0. (#6597)

martinmr · web-flow · commit 0f2807b7003f · 2020-10-04T14:16:18.000-07:00
(cherry picked from commit a4f21f4)
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.

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,9 @@ func (s *Server) Connect(ctx context.Context,`
`502`	`502`	`m.Id = s.nextRaftId`
`503`	`503`	`s.nextRaftId += 1`
`504`	`504`	`proposal.MaxRaftId = m.Id`
	`505`	`+ } else if m.Id >= s.nextRaftId {`
	`506`	`+ s.nextRaftId = m.Id + 1`
	`507`	`+ proposal.MaxRaftId = m.Id`
`505`	`508`	`}`
`506`	`509`
`507`	`510`	`// We don't have this member. So, let's see if it has preference for a group.`