Merge pull request #2261 from yichengq/322

migrate: fix setting commit index from snapshot
release-2.0
Yicheng Qin 2015-02-10 09:57:24 -08:00
commit d74e74d320
1 changed files with 1 additions and 1 deletions

View File

@ -103,7 +103,7 @@ func Migrate4To2(dataDir string, name string) error {
st2 := cfg4.HardState2()
// If we've got the most recent snapshot, we can use it's committed index. Still likely less than the current actual index, but worth it for the replay.
if snap2 != nil {
if snap2 != nil && st2.Commit < snap2.Metadata.Index {
st2.Commit = snap2.Metadata.Index
}