etcdserver: commit before sending snapshot

etcd-io · Jul 3, 2016 · 8a8a825 · 8a8a825
1 parent 7cc4596
commit 8a8a825
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/etcdserver/server.go b/etcdserver/server.go
@@ -1170,8 +1170,7 @@ func (s *EtcdServer) snapshot(snapi uint64, confState raftpb.ConfState) {
 			}
 			plog.Panicf("unexpected create snapshot error %v", err)
 		}
-		// commit v3 storage because WAL file before snapshot index
-		// could be removed after SaveSnap.
+		// commit kv to write metadata (for example: consistent index) to disk.
 		s.KV().Commit()
 		// SaveSnap saves the snapshot and releases the locked wal files
 		// to the snapshot index.

diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go
@@ -39,6 +39,8 @@ func (s *EtcdServer) createMergedSnapshotMessage(m raftpb.Message, snapi uint64,
 		plog.Panicf("store save should never fail: %v", err)
 	}
 
+	// commit kv to write metadata(for example: consistent index).
+	s.KV().Commit()
 	dbsnap := s.be.Snapshot()
 	// get a snapshot of v3 KV as readCloser
 	rc := newSnapshotReaderCloser(dbsnap)