mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdserver: commit before sending snapshot

Browse Source
This commit is contained in:
Xiang Li
2016-07-03 10:16:44 -07:00
parent 7cc4596ebd
commit 8a8a8253fa
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etcdserver/server.go
View File

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

2
etcdserver/snapshot_merge.go
View File

@ -39,6 +39,8 @@ func (s *EtcdServer) createMergedSnapshotMessage(m raftpb.Message, snapi uint64,
plog.Panicf("store save should never fail: %v", err) 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() dbsnap := s.be.Snapshot()
// get a snapshot of v3 KV as readCloser // get a snapshot of v3 KV as readCloser
rc := newSnapshotReaderCloser(dbsnap) rc := newSnapshotReaderCloser(dbsnap)