Merge branch 'restore-remote-fix' into release-2.1

lni · Mar 16, 2019 · 132c4c7 · 132c4c7
2 parents daef61e + 73092ad
commit 132c4c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/internal/rsm/statemachine.go b/internal/rsm/statemachine.go
@@ -149,8 +149,8 @@ func (s *StateMachine) RecoverFromSnapshot(rec Commit) (uint64, error) {
 		rec.InitialSnapshot); !recovered {
 		return idx, err
 	}
-	s.setBatchedLastApplied(snapshot.Index)
 	s.node.RestoreRemotes(snapshot)
+	s.setBatchedLastApplied(snapshot.Index)
 	plog.Infof("%s snapshot %d restored, members %v",
 		s.describe(), snapshot.Index, snapshot.Membership.Addresses)
 	return snapshot.Index, nil