From ce82a3e7ad491920b6b83d869f13c9df0905e8d5 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Thu, 20 Nov 2014 16:49:34 -0500 Subject: [PATCH] Fix migration to allow snapshots to have the right IDs --- migrate/snapshot.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/migrate/snapshot.go b/migrate/snapshot.go index 7dfe270a6..8a457fac9 100644 --- a/migrate/snapshot.go +++ b/migrate/snapshot.go @@ -171,15 +171,17 @@ func (s *Snapshot4) Snapshot5() *raftpb.Snapshot { log.Fatal("Couldn't re-marshal new snapshot") } + nodes := s.GetNodesFromStore() + nodeList := make([]uint64, 0) + for _, v := range nodes { + nodeList = append(nodeList, v) + } + snap5 := raftpb.Snapshot{ Data: newState, Index: s.LastIndex, Term: s.LastTerm, - Nodes: make([]uint64, len(s.Peers)), - } - - for i, p := range s.Peers { - snap5.Nodes[i] = hashName(p.Name) + Nodes: nodeList, } return &snap5