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

Merge pull request #4154 from xiang90/snapshot_from_backend

Browse Source 
*: get snapshot from backend
This commit is contained in:
Xiang Li 2016-01-06 23:10:23 -08:00
commit db60cdc42c
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdserver/snapshot_merge.go
View File

@ -20,7 +20,7 @@ import (
"github.com/coreos/etcd/raft/raftpb"
"github.com/coreos/etcd/snap"
dstorage "github.com/coreos/etcd/storage"
"github.com/coreos/etcd/storage/backend"
)
// createMergedSnapshotMessage creates a snapshot message that contains: raft status (term, conf),
@ -40,7 +40,7 @@ func (s *EtcdServer) createMergedSnapshotMessage(m raftpb.Message, snapi uint64,
}
// get a snapshot of v3 KV as readCloser
rc := newSnapshotReaderCloser(s.kv.Snapshot())
rc := newSnapshotReaderCloser(s.be.Snapshot())
// put the []byte snapshot of store into raft snapshot and return the merged snapshot with
// KV readCloser snapshot.
@ -57,7 +57,7 @@ func (s *EtcdServer) createMergedSnapshotMessage(m raftpb.Message, snapi uint64,
return *snap.NewMessage(m, rc)
}
func newSnapshotReaderCloser(snapshot dstorage.Snapshot) io.ReadCloser {
func newSnapshotReaderCloser(snapshot backend.Snapshot) io.ReadCloser {
pr, pw := io.Pipe()
go func() {
_, err := snapshot.WriteTo(pw)

1
storage/backend/backend.go
View File

@ -105,6 +105,7 @@ func (b *backend) ForceCommit() {
}
func (b *backend) Snapshot() Snapshot {
b.batchTx.Commit()
tx, err := b.db.Begin(false)
if err != nil {
log.Fatalf("storage: cannot begin tx (%s)", err)

5
storage/kv.go
View File

@ -20,8 +20,6 @@ import (
"github.com/coreos/etcd/storage/storagepb"
)
type Snapshot backend.Snapshot
type KV interface {
// Rev returns the current revision of the KV.
Rev() int64
@ -65,9 +63,6 @@ type KV interface {
// This method is designed for consistency checking purpose.
Hash() (uint32, error)
// Snapshot snapshots the full KV store.
Snapshot() Snapshot
// Commit commits txns into the underlying backend.
Commit()

2
storage/kv_test.go
View File

@ -714,7 +714,7 @@ func TestKVSnapshot(t *testing.T) {
}
defer os.Remove(newPath)
snap := s.Snapshot()
snap := s.b.Snapshot()
defer snap.Close()
_, err = snap.WriteTo(f)
if err != nil {

5
storage/kvstore.go
View File

@ -235,11 +235,6 @@ func (s *store) Hash() (uint32, error) {
return s.b.Hash()
}
func (s *store) Snapshot() Snapshot {
s.b.ForceCommit()
return s.b.Snapshot()
}
func (s *store) Commit() { s.b.ForceCommit() }
func (s *store) Restore(b backend.Backend) error {