From 7dabd6c2558c932885540ddd3bcb127091c3f39e Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 21 May 2018 01:28:47 -0700 Subject: [PATCH] *: rename internal packages in tools/testing Signed-off-by: Gyuho Lee --- functional/rpcpb/member.go | 2 +- tests/e2e/ctl_v3_snapshot_test.go | 2 +- tools/etcd-dump-logs/main.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/functional/rpcpb/member.go b/functional/rpcpb/member.go index 01f684113..5d0ad32fc 100644 --- a/functional/rpcpb/member.go +++ b/functional/rpcpb/member.go @@ -23,9 +23,9 @@ import ( "time" "github.com/coreos/etcd/clientv3" + "github.com/coreos/etcd/clientv3/snapshot" pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/snapshot" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go index 0df7a5f9d..f69089b97 100644 --- a/tests/e2e/ctl_v3_snapshot_test.go +++ b/tests/e2e/ctl_v3_snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" + "github.com/coreos/etcd/clientv3/snapshot" "github.com/coreos/etcd/pkg/expect" "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/snapshot" ) func TestCtlV3Snapshot(t *testing.T) { testCtl(t, snapshotTest) } diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index f95eaa6a4..3a957e951 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -22,11 +22,11 @@ import ( "strings" "time" + "github.com/coreos/etcd/etcdserver/api/snap" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/raftsnap" "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" @@ -65,10 +65,10 @@ func main() { walsnap.Index = *index } else { if *snapfile == "" { - ss := raftsnap.New(zap.NewExample(), snapDir(dataDir)) + ss := snap.New(zap.NewExample(), snapDir(dataDir)) snapshot, err = ss.Load() } else { - snapshot, err = raftsnap.Read(zap.NewExample(), filepath.Join(snapDir(dataDir), *snapfile)) + snapshot, err = snap.Read(zap.NewExample(), filepath.Join(snapDir(dataDir), *snapfile)) } switch err { @@ -77,7 +77,7 @@ func main() { nodes := genIDSlice(snapshot.Metadata.ConfState.Nodes) fmt.Printf("Snapshot:\nterm=%d index=%d nodes=%s\n", walsnap.Term, walsnap.Index, nodes) - case raftsnap.ErrNoSnapshot: + case snap.ErrNoSnapshot: fmt.Printf("Snapshot:\nempty\n") default: log.Fatalf("Failed loading snapshot: %v", err)