Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: commit v3 storage before releasing WAL

Browse Source 
This ensures that v3 storage could always find the following log entries
when restart.
This commit is contained in:
Yicheng Qin 2015-10-26 21:06:08 -07:00
parent 7e38f05ceb
commit 263b270708
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etcdserver/server.go
View File

@ -1029,6 +1029,13 @@ func (s *EtcdServer) snapshot(snapi uint64, confState raftpb.ConfState) {
}
plog.Panicf("unexpected create snapshot error %v", err)
}
if s.cfg.V3demo {
// commit v3 storage because WAL file before snapshot index
// could be removed after SaveSnap.
s.kv.Commit()
}
// SaveSnap saves the snapshot and releases the locked wal files
// to the snapshot index.
if err := s.r.storage.SaveSnap(snap); err != nil {
plog.Fatalf("save snapshot error: %v", err)
}

1
etcdserver/snapshot_store_test.go
View File

@ -186,6 +186,7 @@ func (kv *nopKV) TxnDeleteRange(txnID int64, key, end []byte) (n, rev int64, err
func (kv *nopKV) Compact(rev int64) error { return nil }
func (kv *nopKV) Hash() (uint32, error) { return 0, nil }
func (kv *nopKV) Snapshot() dstorage.Snapshot { return &fakeSnapshot{} }
func (kv *nopKV) Commit() {}
func (kv *nopKV) Restore() error { return nil }
func (kv *nopKV) Close() error { return nil }

3
storage/kv.go
View File

@ -69,6 +69,9 @@ type KV interface {
// Snapshot snapshots the full KV store.
Snapshot() Snapshot
// Commit commits txns into the underlying backend.
Commit()
Restore() error
Close() error
}

2
storage/kvstore.go
View File

@ -294,6 +294,8 @@ func (s *store) Snapshot() Snapshot {
return s.b.Snapshot()
}
func (s *store) Commit() { s.b.ForceCommit() }
func (s *store) Restore() error {
s.mu.Lock()
defer s.mu.Unlock()