Merge pull request #5629 from hbasappa/peersjon

Add support in nomad for supporting raft 3 protocol peers.json
hashicorp · May 3, 2019 · 0e21642 · 0e21642
2 parents 01c267b + 8d87ae3
commit 0e21642
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/nomad/server.go b/nomad/server.go
@@ -1169,7 +1169,12 @@ func (s *Server) setupRaft() error {
 			}
 		} else if _, err := os.Stat(peersFile); err == nil {
 			s.logger.Info("found peers.json file, recovering Raft configuration...")
-			configuration, err := raft.ReadPeersJSON(peersFile)
+			var configuration raft.Configuration
+			if s.config.RaftConfig.ProtocolVersion < 3 {
+				configuration, err = raft.ReadPeersJSON(peersFile)
+			} else {
+				configuration, err = raft.ReadConfigJSON(peersFile)
+			}
 			if err != nil {
 				return fmt.Errorf("recovery failed to parse peers.json: %v", err)
 			}