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

snapshot: support structured logger

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-16 03:59:48 -07:00
parent f57fa6abaf
commit d1c7d40a5e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
snapshot/v3_snapshot.go
View File

@ -248,7 +248,7 @@ func (s *v3Manager) Restore(cfg RestoreConfig) error {
return err return err
} }
s.cl, err = membership.NewClusterFromURLsMap(cfg.InitialClusterToken, ics) s.cl, err = membership.NewClusterFromURLsMap(s.lg, cfg.InitialClusterToken, ics)
if err != nil { if err != nil {
return err return err
} }
@ -374,7 +374,7 @@ func (s *v3Manager) saveDB() error {
// a lessor never timeouts leases // a lessor never timeouts leases
lessor := lease.NewLessor(be, math.MaxInt64) lessor := lease.NewLessor(be, math.MaxInt64)
mvs := mvcc.NewStore(be, lessor, (*initIndex)(&commit)) mvs := mvcc.NewStore(s.lg, be, lessor, (*initIndex)(&commit))
txn := mvs.Write() txn := mvs.Write()
btx := be.BatchTx() btx := be.BatchTx()
del := func(k, v []byte) error { del := func(k, v []byte) error {
@ -417,7 +417,7 @@ func (s *v3Manager) saveWALAndSnap() error {
if merr != nil { if merr != nil {
return merr return merr
} }
w, walerr := wal.Create(s.walDir, metadata) w, walerr := wal.Create(s.lg, s.walDir, metadata)
if walerr != nil { if walerr != nil {
return walerr return walerr
} }
@ -476,10 +476,9 @@ func (s *v3Manager) saveWALAndSnap() error {
}, },
}, },
} }
sn := raftsnap.New(s.snapDir) sn := raftsnap.New(s.lg, s.snapDir)
if err := sn.SaveSnap(raftSnap); err != nil { if err := sn.SaveSnap(raftSnap); err != nil {
return err return err
} }
return w.SaveSnapshot(walpb.Snapshot{Index: commit, Term: term}) return w.SaveSnapshot(walpb.Snapshot{Index: commit, Term: term})
} }