diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index f26c0bb40..08fba7251 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -33,6 +33,8 @@ import ( "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" + + "go.uber.org/zap" ) // A key-value stream backed by raft @@ -201,7 +203,7 @@ func (rc *raftNode) openWAL(snapshot *raftpb.Snapshot) *wal.WAL { log.Fatalf("raftexample: cannot create dir for wal (%v)", err) } - w, err := wal.Create(rc.waldir, nil) + w, err := wal.Create(zap.NewExample(), rc.waldir, nil) if err != nil { log.Fatalf("raftexample: create wal error (%v)", err) } @@ -213,7 +215,7 @@ func (rc *raftNode) openWAL(snapshot *raftpb.Snapshot) *wal.WAL { walsnap.Index, walsnap.Term = snapshot.Metadata.Index, snapshot.Metadata.Term } log.Printf("loading WAL at term %d and index %d", walsnap.Term, walsnap.Index) - w, err := wal.Open(rc.waldir, walsnap) + w, err := wal.Open(zap.NewExample(), rc.waldir, walsnap) if err != nil { log.Fatalf("raftexample: error loading wal (%v)", err) } @@ -261,7 +263,7 @@ func (rc *raftNode) startRaft() { log.Fatalf("raftexample: cannot create dir for snapshot (%v)", err) } } - rc.snapshotter = raftsnap.New(rc.snapdir) + rc.snapshotter = raftsnap.New(zap.NewExample(), rc.snapdir) rc.snapshotterReady <- rc.snapshotter oldwal := wal.Exist(rc.waldir) @@ -291,6 +293,7 @@ func (rc *raftNode) startRaft() { } rc.transport = &rafthttp.Transport{ + Logger: zap.NewExample(), ID: types.ID(rc.id), ClusterID: 0x1000, Raft: rc, diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index 3da8679b1..0e85d4b41 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -18,6 +18,8 @@ import ( "os" "time" + "go.uber.org/zap" + "github.com/coreos/etcd/lease" "github.com/coreos/etcd/mvcc" "github.com/coreos/etcd/mvcc/backend" @@ -36,7 +38,7 @@ func initMVCC() { bcfg := backend.DefaultBackendConfig() bcfg.Path, bcfg.BatchInterval, bcfg.BatchLimit = "mvcc-bench", time.Duration(batchInterval)*time.Millisecond, batchLimit be := backend.New(bcfg) - s = mvcc.NewStore(be, &lease.FakeLessor{}, nil) + s = mvcc.NewStore(zap.NewExample(), be, &lease.FakeLessor{}, nil) os.Remove("mvcc-bench") // boltDB has an opened fd, so removing the file is ok } diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index c1a1e2bb8..6ac060b23 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -28,6 +28,8 @@ import ( "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" + + "go.uber.org/zap" ) func main() { @@ -57,7 +59,7 @@ func main() { walsnap.Index = *index } else { if *snapfile == "" { - ss := raftsnap.New(snapDir(dataDir)) + ss := raftsnap.New(zap.NewExample(), snapDir(dataDir)) snapshot, err = ss.Load() } else { snapshot, err = raftsnap.Read(filepath.Join(snapDir(dataDir), *snapfile)) @@ -77,7 +79,7 @@ func main() { fmt.Println("Start dupmping log entries from snapshot.") } - w, err := wal.OpenForRead(walDir(dataDir), walsnap) + w, err := wal.OpenForRead(zap.NewExample(), walDir(dataDir), walsnap) if err != nil { log.Fatalf("Failed opening WAL: %v", err) }