From e62417297d21d4379a178b22dc912555223a1b42 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Thu, 15 Oct 2020 20:03:15 +0200 Subject: [PATCH] *: Rename of imports of raft (as its now a module) % find -name '*.go' -o -name '*.md' -o -name '*.sh' | xargs sed -i --follow-symlinks 's|etcd/v3/raft|etcd/raft/v3|g' --- contrib/raftexample/httpapi.go | 2 +- contrib/raftexample/main.go | 2 +- contrib/raftexample/raft.go | 4 ++-- contrib/raftexample/raftexample_test.go | 2 +- etcdctl/ctlv2/command/backup_command.go | 2 +- etcdctl/ctlv3/command/migrate_command.go | 2 +- etcdctl/snapshot/v3_snapshot.go | 4 ++-- etcdserver/api/etcdhttp/metrics.go | 2 +- etcdserver/api/membership/cluster.go | 4 ++-- etcdserver/api/membership/cluster_test.go | 2 +- etcdserver/api/rafthttp/coder.go | 2 +- etcdserver/api/rafthttp/functional_test.go | 4 ++-- etcdserver/api/rafthttp/http.go | 2 +- etcdserver/api/rafthttp/http_test.go | 2 +- etcdserver/api/rafthttp/msg_codec.go | 2 +- etcdserver/api/rafthttp/msg_codec_test.go | 2 +- etcdserver/api/rafthttp/msgappv2_codec.go | 2 +- etcdserver/api/rafthttp/msgappv2_codec_test.go | 2 +- etcdserver/api/rafthttp/peer.go | 4 ++-- etcdserver/api/rafthttp/peer_test.go | 2 +- etcdserver/api/rafthttp/pipeline.go | 4 ++-- etcdserver/api/rafthttp/pipeline_test.go | 2 +- etcdserver/api/rafthttp/remote.go | 2 +- etcdserver/api/rafthttp/snapshot_sender.go | 2 +- etcdserver/api/rafthttp/snapshot_test.go | 2 +- etcdserver/api/rafthttp/stream.go | 2 +- etcdserver/api/rafthttp/stream_test.go | 2 +- etcdserver/api/rafthttp/transport.go | 4 ++-- etcdserver/api/rafthttp/transport_bench_test.go | 4 ++-- etcdserver/api/rafthttp/transport_test.go | 2 +- etcdserver/api/rafthttp/util_test.go | 2 +- etcdserver/api/snap/message.go | 2 +- etcdserver/api/snap/snapshotter.go | 4 ++-- etcdserver/api/snap/snapshotter_test.go | 2 +- etcdserver/api/v2http/client_test.go | 2 +- etcdserver/api/v2http/http_test.go | 2 +- etcdserver/api/v2stats/server.go | 2 +- etcdserver/api/v3rpc/interceptor.go | 2 +- etcdserver/api/v3rpc/maintenance.go | 2 +- etcdserver/backend.go | 2 +- etcdserver/raft.go | 4 ++-- etcdserver/raft_test.go | 4 ++-- etcdserver/server.go | 4 ++-- etcdserver/server_test.go | 4 ++-- etcdserver/snapshot_merge.go | 2 +- etcdserver/storage.go | 2 +- etcdserver/util_test.go | 2 +- etcdserver/v3_server.go | 2 +- etcdserver/zap_raft.go | 2 +- raft/bootstrap.go | 2 +- raft/confchange/confchange.go | 6 +++--- raft/confchange/datadriven_test.go | 4 ++-- raft/confchange/quick_test.go | 4 ++-- raft/confchange/restore.go | 4 ++-- raft/confchange/restore_test.go | 4 ++-- raft/example_test.go | 2 +- raft/interaction_test.go | 2 +- raft/log.go | 2 +- raft/log_test.go | 2 +- raft/log_unstable.go | 2 +- raft/log_unstable_test.go | 2 +- raft/node.go | 2 +- raft/node_test.go | 2 +- raft/raft.go | 8 ++++---- raft/raft_flow_control_test.go | 2 +- raft/raft_paper_test.go | 2 +- raft/raft_snap_test.go | 2 +- raft/raft_test.go | 4 ++-- raft/rafttest/interaction_env.go | 4 ++-- raft/rafttest/interaction_env_handler_add_nodes.go | 4 ++-- raft/rafttest/interaction_env_handler_deliver_msgs.go | 4 ++-- raft/rafttest/interaction_env_handler_process_ready.go | 4 ++-- .../interaction_env_handler_propose_conf_change.go | 2 +- raft/rafttest/interaction_env_handler_raft_log.go | 2 +- raft/rafttest/interaction_env_handler_stabilize.go | 2 +- raft/rafttest/interaction_env_handler_status.go | 2 +- raft/rafttest/interaction_env_logger.go | 2 +- raft/rafttest/network.go | 2 +- raft/rafttest/network_test.go | 2 +- raft/rafttest/node.go | 4 ++-- raft/rafttest/node_bench_test.go | 2 +- raft/rafttest/node_test.go | 2 +- raft/rawnode.go | 4 ++-- raft/rawnode_test.go | 6 +++--- raft/read_only.go | 2 +- raft/status.go | 4 ++-- raft/storage.go | 2 +- raft/storage_test.go | 2 +- raft/tracker/tracker.go | 4 ++-- raft/util.go | 2 +- raft/util_test.go | 2 +- server/mock/mockstorage/storage_recorder.go | 4 ++-- tests/functional/tester/stresser_key.go | 2 +- tools/etcd-dump-logs/etcd-dump-log_test.go | 2 +- tools/etcd-dump-logs/main.go | 2 +- wal/decoder.go | 2 +- wal/repair_test.go | 2 +- wal/wal.go | 4 ++-- wal/wal_bench_test.go | 2 +- wal/wal_test.go | 2 +- 100 files changed, 135 insertions(+), 135 deletions(-) diff --git a/contrib/raftexample/httpapi.go b/contrib/raftexample/httpapi.go index 3e1c585b5..13445597e 100644 --- a/contrib/raftexample/httpapi.go +++ b/contrib/raftexample/httpapi.go @@ -20,7 +20,7 @@ import ( "net/http" "strconv" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) // Handler for a http based key-value store backed by raft diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go index 775ea7b99..b52a1fb64 100644 --- a/contrib/raftexample/main.go +++ b/contrib/raftexample/main.go @@ -18,7 +18,7 @@ import ( "flag" "strings" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func main() { diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index c1aeed361..e7ed6566c 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -26,11 +26,11 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/v3/etcdserver/api/snap" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index d03e3f043..6c0b629c6 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) type cluster struct { diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index 8f26c8514..22440d9e5 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -27,9 +27,9 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/idutil" "go.etcd.io/etcd/pkg/v3/pbutil" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index 7da88e685..95fd02541 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/etcdctl/ctlv3/command/migrate_command.go @@ -29,6 +29,7 @@ import ( "go.etcd.io/etcd/client/v2" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" @@ -37,7 +38,6 @@ import ( "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" diff --git a/etcdctl/snapshot/v3_snapshot.go b/etcdctl/snapshot/v3_snapshot.go index d544b836d..411fc98d4 100644 --- a/etcdctl/snapshot/v3_snapshot.go +++ b/etcdctl/snapshot/v3_snapshot.go @@ -32,6 +32,8 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/snapshot" "go.etcd.io/etcd/v3/etcdserver" @@ -42,8 +44,6 @@ import ( "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index 5765028a7..4bb8ba094 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -24,8 +24,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/raft" "go.uber.org/zap" ) diff --git a/etcdserver/api/membership/cluster.go b/etcdserver/api/membership/cluster.go index 07d9cf5c9..eb4ed9002 100644 --- a/etcdserver/api/membership/cluster.go +++ b/etcdserver/api/membership/cluster.go @@ -30,10 +30,10 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/netutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/coreos/go-semver/semver" "github.com/prometheus/client_golang/prometheus" diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index ede80bf02..7b782adce 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -25,8 +25,8 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/server/mock/mockstore" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/coder.go b/etcdserver/api/rafthttp/coder.go index f06f070b3..cc2824969 100644 --- a/etcdserver/api/rafthttp/coder.go +++ b/etcdserver/api/rafthttp/coder.go @@ -14,7 +14,7 @@ package rafthttp -import "go.etcd.io/etcd/v3/raft/raftpb" +import "go.etcd.io/etcd/raft/v3/raftpb" type encoder interface { // encode encodes the given message to an output stream. diff --git a/etcdserver/api/rafthttp/functional_test.go b/etcdserver/api/rafthttp/functional_test.go index 9d2010d26..8ea843135 100644 --- a/etcdserver/api/rafthttp/functional_test.go +++ b/etcdserver/api/rafthttp/functional_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/http.go b/etcdserver/api/rafthttp/http.go index 24a06b966..2764c46cc 100644 --- a/etcdserver/api/rafthttp/http.go +++ b/etcdserver/api/rafthttp/http.go @@ -27,8 +27,8 @@ import ( "go.etcd.io/etcd/api/v3/version" pioutil "go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/http_test.go b/etcdserver/api/rafthttp/http_test.go index e6688c76b..57903e57c 100644 --- a/etcdserver/api/rafthttp/http_test.go +++ b/etcdserver/api/rafthttp/http_test.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/msg_codec.go b/etcdserver/api/rafthttp/msg_codec.go index 7d3e6aaf0..7db880baa 100644 --- a/etcdserver/api/rafthttp/msg_codec.go +++ b/etcdserver/api/rafthttp/msg_codec.go @@ -20,7 +20,7 @@ import ( "io" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) // messageEncoder is a encoder that can encode all kinds of messages. diff --git a/etcdserver/api/rafthttp/msg_codec_test.go b/etcdserver/api/rafthttp/msg_codec_test.go index d2ea66fb4..671e354d6 100644 --- a/etcdserver/api/rafthttp/msg_codec_test.go +++ b/etcdserver/api/rafthttp/msg_codec_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func TestMessage(t *testing.T) { diff --git a/etcdserver/api/rafthttp/msgappv2_codec.go b/etcdserver/api/rafthttp/msgappv2_codec.go index 0adf527b2..8d5b9aaa8 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec.go +++ b/etcdserver/api/rafthttp/msgappv2_codec.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft/raftpb" ) const ( diff --git a/etcdserver/api/rafthttp/msgappv2_codec_test.go b/etcdserver/api/rafthttp/msgappv2_codec_test.go index 52ce6e437..ec0a7f260 100644 --- a/etcdserver/api/rafthttp/msgappv2_codec_test.go +++ b/etcdserver/api/rafthttp/msgappv2_codec_test.go @@ -20,8 +20,8 @@ import ( "testing" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/etcdserver/api/rafthttp/peer.go b/etcdserver/api/rafthttp/peer.go index 1f41fe962..8aa9848d2 100644 --- a/etcdserver/api/rafthttp/peer.go +++ b/etcdserver/api/rafthttp/peer.go @@ -20,10 +20,10 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/etcdserver/api/rafthttp/peer_test.go b/etcdserver/api/rafthttp/peer_test.go index a0b29dad3..1242be028 100644 --- a/etcdserver/api/rafthttp/peer_test.go +++ b/etcdserver/api/rafthttp/peer_test.go @@ -17,7 +17,7 @@ package rafthttp import ( "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func TestPeerPick(t *testing.T) { diff --git a/etcdserver/api/rafthttp/pipeline.go b/etcdserver/api/rafthttp/pipeline.go index 016de02bd..b8a889bed 100644 --- a/etcdserver/api/rafthttp/pipeline.go +++ b/etcdserver/api/rafthttp/pipeline.go @@ -24,9 +24,9 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/pipeline_test.go b/etcdserver/api/rafthttp/pipeline_test.go index d9fa4186b..26a231ad2 100644 --- a/etcdserver/api/rafthttp/pipeline_test.go +++ b/etcdserver/api/rafthttp/pipeline_test.go @@ -27,8 +27,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/remote.go b/etcdserver/api/rafthttp/remote.go index 6121cf566..c82fb17a7 100644 --- a/etcdserver/api/rafthttp/remote.go +++ b/etcdserver/api/rafthttp/remote.go @@ -16,7 +16,7 @@ package rafthttp import ( "go.etcd.io/etcd/pkg/v3/types" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/snapshot_sender.go b/etcdserver/api/rafthttp/snapshot_sender.go index 9154a67d5..a01a52bb0 100644 --- a/etcdserver/api/rafthttp/snapshot_sender.go +++ b/etcdserver/api/rafthttp/snapshot_sender.go @@ -25,8 +25,8 @@ import ( "go.etcd.io/etcd/pkg/v3/httputil" pioutil "go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/snapshot_test.go b/etcdserver/api/rafthttp/snapshot_test.go index 40de56e17..d91a8aff3 100644 --- a/etcdserver/api/rafthttp/snapshot_test.go +++ b/etcdserver/api/rafthttp/snapshot_test.go @@ -26,8 +26,8 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/stream.go b/etcdserver/api/rafthttp/stream.go index 7ae38f64a..84c2b42b4 100644 --- a/etcdserver/api/rafthttp/stream.go +++ b/etcdserver/api/rafthttp/stream.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/pkg/v3/httputil" "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/stream_test.go b/etcdserver/api/rafthttp/stream_test.go index 41cb8b852..51ea6e0f1 100644 --- a/etcdserver/api/rafthttp/stream_test.go +++ b/etcdserver/api/rafthttp/stream_test.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport.go b/etcdserver/api/rafthttp/transport.go index d5f881aa5..e1ab452a6 100644 --- a/etcdserver/api/rafthttp/transport.go +++ b/etcdserver/api/rafthttp/transport.go @@ -22,10 +22,10 @@ import ( "go.etcd.io/etcd/pkg/v3/transport" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/xiang90/probing" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/transport_bench_test.go b/etcdserver/api/rafthttp/transport_bench_test.go index ab352bbdd..74bd18d2f 100644 --- a/etcdserver/api/rafthttp/transport_bench_test.go +++ b/etcdserver/api/rafthttp/transport_bench_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/rafthttp/transport_test.go b/etcdserver/api/rafthttp/transport_test.go index 5e2d042d0..ec3d1f32f 100644 --- a/etcdserver/api/rafthttp/transport_test.go +++ b/etcdserver/api/rafthttp/transport_test.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" stats "go.etcd.io/etcd/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/xiang90/probing" "go.uber.org/zap" diff --git a/etcdserver/api/rafthttp/util_test.go b/etcdserver/api/rafthttp/util_test.go index 857f06bc5..d93d4d91f 100644 --- a/etcdserver/api/rafthttp/util_test.go +++ b/etcdserver/api/rafthttp/util_test.go @@ -23,7 +23,7 @@ import ( "testing" "go.etcd.io/etcd/api/v3/version" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/api/snap/message.go b/etcdserver/api/snap/message.go index 3442e3bdf..523b52b85 100644 --- a/etcdserver/api/snap/message.go +++ b/etcdserver/api/snap/message.go @@ -18,7 +18,7 @@ import ( "io" "go.etcd.io/etcd/pkg/v3/ioutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) // Message is a struct that contains a raft Message and a ReadCloser. The type diff --git a/etcdserver/api/snap/snapshotter.go b/etcdserver/api/snap/snapshotter.go index f02f1c763..0fc1ea067 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -28,9 +28,9 @@ import ( pioutil "go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/pbutil" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap/snappb" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" diff --git a/etcdserver/api/snap/snapshotter_test.go b/etcdserver/api/snap/snapshotter_test.go index 5826e3750..7a477b866 100644 --- a/etcdserver/api/snap/snapshotter_test.go +++ b/etcdserver/api/snap/snapshotter_test.go @@ -24,7 +24,7 @@ import ( "testing" "go.etcd.io/etcd/pkg/v3/fileutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdserver/api/v2http/client_test.go b/etcdserver/api/v2http/client_test.go index f1298bec1..853133f09 100644 --- a/etcdserver/api/v2http/client_test.go +++ b/etcdserver/api/v2http/client_test.go @@ -32,13 +32,13 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/v2error" "go.etcd.io/etcd/v3/etcdserver/api/v2http/httptypes" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/coreos/go-semver/semver" "github.com/jonboulle/clockwork" diff --git a/etcdserver/api/v2http/http_test.go b/etcdserver/api/v2http/http_test.go index c219040ad..79353698e 100644 --- a/etcdserver/api/v2http/http_test.go +++ b/etcdserver/api/v2http/http_test.go @@ -24,10 +24,10 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/v2error" - "go.etcd.io/etcd/v3/raft/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/etcdserver/api/v2stats/server.go b/etcdserver/api/v2stats/server.go index 21987d2b6..45effb1ed 100644 --- a/etcdserver/api/v2stats/server.go +++ b/etcdserver/api/v2stats/server.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft/v3" ) // ServerStats encapsulates various statistics about an EtcdServer and its diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go index 622803f65..7f4d10e68 100644 --- a/etcdserver/api/v3rpc/interceptor.go +++ b/etcdserver/api/v3rpc/interceptor.go @@ -21,9 +21,9 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/etcdserver/api" - "go.etcd.io/etcd/v3/raft" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.uber.org/zap" diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index 9d2dde2b6..a25a4f93c 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -24,11 +24,11 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" + "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft" "go.uber.org/zap" ) diff --git a/etcdserver/backend.go b/etcdserver/backend.go index f5b53758e..37527f5bb 100644 --- a/etcdserver/backend.go +++ b/etcdserver/backend.go @@ -19,10 +19,10 @@ import ( "os" "time" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/etcdserver/cindex" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft/raftpb" "go.uber.org/zap" ) diff --git a/etcdserver/raft.go b/etcdserver/raft.go index ec7a5011f..67fdb93a6 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -28,10 +28,10 @@ import ( "go.etcd.io/etcd/pkg/v3/logutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index d7a705899..0920e527b 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -24,9 +24,9 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/server/mock/mockstorage" "go.uber.org/zap" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 4b35ce615..22b5bad7c 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -45,6 +45,8 @@ import ( "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/wait" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver/api" "go.etcd.io/etcd/v3/etcdserver/api/membership" @@ -61,8 +63,6 @@ import ( "go.etcd.io/etcd/v3/lease/leasehttp" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" ) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index cebe5020b..4e24c7d3e 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -34,6 +34,8 @@ import ( "go.etcd.io/etcd/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/wait" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/v3/etcdserver/api/snap" @@ -42,8 +44,6 @@ import ( "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/server/mock/mockstorage" "go.etcd.io/etcd/v3/server/mock/mockstore" "go.etcd.io/etcd/v3/server/mock/mockwait" diff --git a/etcdserver/snapshot_merge.go b/etcdserver/snapshot_merge.go index a7b16add5..2b45d9549 100644 --- a/etcdserver/snapshot_merge.go +++ b/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" "go.etcd.io/etcd/v3/mvcc/backend" - "go.etcd.io/etcd/v3/raft/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/etcdserver/storage.go b/etcdserver/storage.go index 5f46a1cb0..1ecd13814 100644 --- a/etcdserver/storage.go +++ b/etcdserver/storage.go @@ -20,8 +20,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" diff --git a/etcdserver/util_test.go b/etcdserver/util_test.go index 6c92370d4..746f3fe1a 100644 --- a/etcdserver/util_test.go +++ b/etcdserver/util_test.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" ) func TestLongestConnected(t *testing.T) { diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index 7a904dc1c..ec3ae23fc 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -25,12 +25,12 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/pkg/v3/traceutil" + "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/v3/auth" "go.etcd.io/etcd/v3/etcdserver/api/membership" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/lease/leasehttp" "go.etcd.io/etcd/v3/mvcc" - "go.etcd.io/etcd/v3/raft" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/etcdserver/zap_raft.go b/etcdserver/zap_raft.go index 11115d217..e8174f396 100644 --- a/etcdserver/zap_raft.go +++ b/etcdserver/zap_raft.go @@ -17,7 +17,7 @@ package etcdserver import ( "errors" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft/v3" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/raft/bootstrap.go b/raft/bootstrap.go index 9a827df93..824bd5f51 100644 --- a/raft/bootstrap.go +++ b/raft/bootstrap.go @@ -17,7 +17,7 @@ package raft import ( "errors" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) // Bootstrap initializes the RawNode for first use by appending configuration diff --git a/raft/confchange/confchange.go b/raft/confchange/confchange.go index 2ad8554e7..85689b448 100644 --- a/raft/confchange/confchange.go +++ b/raft/confchange/confchange.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/v3/raft/quorum" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + "go.etcd.io/etcd/raft/v3/quorum" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // Changer facilitates configuration changes. It exposes methods to handle diff --git a/raft/confchange/datadriven_test.go b/raft/confchange/datadriven_test.go index 2ae50041a..ab1524091 100644 --- a/raft/confchange/datadriven_test.go +++ b/raft/confchange/datadriven_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) func TestConfChangeDataDriven(t *testing.T) { diff --git a/raft/confchange/quick_test.go b/raft/confchange/quick_test.go index 441990fac..16d72c199 100644 --- a/raft/confchange/quick_test.go +++ b/raft/confchange/quick_test.go @@ -21,8 +21,8 @@ import ( "testing" "testing/quick" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // TestConfChangeQuick uses quickcheck to verify that simple and joint config diff --git a/raft/confchange/restore.go b/raft/confchange/restore.go index 1692c0507..ea317fc28 100644 --- a/raft/confchange/restore.go +++ b/raft/confchange/restore.go @@ -15,8 +15,8 @@ package confchange import ( - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // toConfChangeSingle translates a conf state into 1) a slice of operations creating diff --git a/raft/confchange/restore_test.go b/raft/confchange/restore_test.go index 84dd5193f..50712c794 100644 --- a/raft/confchange/restore_test.go +++ b/raft/confchange/restore_test.go @@ -21,8 +21,8 @@ import ( "testing" "testing/quick" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) type rndConfChange pb.ConfState diff --git a/raft/example_test.go b/raft/example_test.go index 11934b23c..51c168924 100644 --- a/raft/example_test.go +++ b/raft/example_test.go @@ -15,7 +15,7 @@ package raft import ( - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func applyToStore(ents []pb.Entry) {} diff --git a/raft/interaction_test.go b/raft/interaction_test.go index 98f14cf5b..57d0d97d4 100644 --- a/raft/interaction_test.go +++ b/raft/interaction_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft/rafttest" + "go.etcd.io/etcd/raft/v3/rafttest" ) func TestInteraction(t *testing.T) { diff --git a/raft/log.go b/raft/log.go index c4162d667..b786e7d4a 100644 --- a/raft/log.go +++ b/raft/log.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) type raftLog struct { diff --git a/raft/log_test.go b/raft/log_test.go index de5830315..0ad23f93b 100644 --- a/raft/log_test.go +++ b/raft/log_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func TestFindConflict(t *testing.T) { diff --git a/raft/log_unstable.go b/raft/log_unstable.go index 56c4ba4d1..230fd21f9 100644 --- a/raft/log_unstable.go +++ b/raft/log_unstable.go @@ -14,7 +14,7 @@ package raft -import pb "go.etcd.io/etcd/v3/raft/raftpb" +import pb "go.etcd.io/etcd/raft/v3/raftpb" // unstable.entries[i] has raft log position i+unstable.offset. // Note that unstable.offset may be less than the highest log diff --git a/raft/log_unstable_test.go b/raft/log_unstable_test.go index 9393edc0c..8d9b46683 100644 --- a/raft/log_unstable_test.go +++ b/raft/log_unstable_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func TestUnstableMaybeFirstIndex(t *testing.T) { diff --git a/raft/node.go b/raft/node.go index 078a043b8..2a8f12ba4 100644 --- a/raft/node.go +++ b/raft/node.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) type SnapshotStatus int diff --git a/raft/node_test.go b/raft/node_test.go index 31c13197c..7c2e951ac 100644 --- a/raft/node_test.go +++ b/raft/node_test.go @@ -25,7 +25,7 @@ import ( "time" "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) // readyWithTimeout selects from n.Ready() with a 1-second timeout. It diff --git a/raft/raft.go b/raft/raft.go index 2c065186b..d9d9419d4 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft/confchange" - "go.etcd.io/etcd/v3/raft/quorum" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + "go.etcd.io/etcd/raft/v3/confchange" + "go.etcd.io/etcd/raft/v3/quorum" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // None is a placeholder node ID used when there is no leader. diff --git a/raft/raft_flow_control_test.go b/raft/raft_flow_control_test.go index a48e5a44d..5dee958ef 100644 --- a/raft/raft_flow_control_test.go +++ b/raft/raft_flow_control_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) // TestMsgAppFlowControlFull ensures: diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go index f4199301c..9a8ab97a5 100644 --- a/raft/raft_paper_test.go +++ b/raft/raft_paper_test.go @@ -32,7 +32,7 @@ import ( "sort" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func TestFollowerUpdateTermFromMessage(t *testing.T) { diff --git a/raft/raft_snap_test.go b/raft/raft_snap_test.go index b7f6f7df7..22186e607 100644 --- a/raft/raft_snap_test.go +++ b/raft/raft_snap_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) var ( diff --git a/raft/raft_test.go b/raft/raft_test.go index 7cd849b23..53d842d82 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // nextEnts returns the appliable entries and updates the applied index diff --git a/raft/rafttest/interaction_env.go b/raft/rafttest/interaction_env.go index 4764ba379..e52f8cb80 100644 --- a/raft/rafttest/interaction_env.go +++ b/raft/rafttest/interaction_env.go @@ -19,8 +19,8 @@ import ( "math" "strings" - "go.etcd.io/etcd/v3/raft" - pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) // InteractionOpts groups the options for an InteractionEnv. diff --git a/raft/rafttest/interaction_env_handler_add_nodes.go b/raft/rafttest/interaction_env_handler_add_nodes.go index f6efe95f8..517477ef4 100644 --- a/raft/rafttest/interaction_env_handler_add_nodes.go +++ b/raft/rafttest/interaction_env_handler_add_nodes.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft" - pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func (env *InteractionEnv) handleAddNodes(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_deliver_msgs.go b/raft/rafttest/interaction_env_handler_deliver_msgs.go index bd839e77a..8072e876f 100644 --- a/raft/rafttest/interaction_env_handler_deliver_msgs.go +++ b/raft/rafttest/interaction_env_handler_deliver_msgs.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" ) func (env *InteractionEnv) handleDeliverMsgs(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_process_ready.go b/raft/rafttest/interaction_env_handler_process_ready.go index ccb312844..017f0739c 100644 --- a/raft/rafttest/interaction_env_handler_process_ready.go +++ b/raft/rafttest/interaction_env_handler_process_ready.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" ) func (env *InteractionEnv) handleProcessReady(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_propose_conf_change.go b/raft/rafttest/interaction_env_handler_propose_conf_change.go index 173065934..ddc8ffcbd 100644 --- a/raft/rafttest/interaction_env_handler_propose_conf_change.go +++ b/raft/rafttest/interaction_env_handler_propose_conf_change.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func (env *InteractionEnv) handleProposeConfChange(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_raft_log.go b/raft/rafttest/interaction_env_handler_raft_log.go index 59a816cc0..5a99e3e18 100644 --- a/raft/rafttest/interaction_env_handler_raft_log.go +++ b/raft/rafttest/interaction_env_handler_raft_log.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft/v3" ) func (env *InteractionEnv) handleRaftLog(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_stabilize.go b/raft/rafttest/interaction_env_handler_stabilize.go index 40237334f..6ae457654 100644 --- a/raft/rafttest/interaction_env_handler_stabilize.go +++ b/raft/rafttest/interaction_env_handler_stabilize.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func (env *InteractionEnv) handleStabilize(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_handler_status.go b/raft/rafttest/interaction_env_handler_status.go index 55bc84089..bf5973a3b 100644 --- a/raft/rafttest/interaction_env_handler_status.go +++ b/raft/rafttest/interaction_env_handler_status.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "go.etcd.io/etcd/v3/raft/tracker" + "go.etcd.io/etcd/raft/v3/tracker" ) func (env *InteractionEnv) handleStatus(t *testing.T, d datadriven.TestData) error { diff --git a/raft/rafttest/interaction_env_logger.go b/raft/rafttest/interaction_env_logger.go index fcd5ba236..1b883d559 100644 --- a/raft/rafttest/interaction_env_logger.go +++ b/raft/rafttest/interaction_env_logger.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft/v3" ) type logLevels [6]string diff --git a/raft/rafttest/network.go b/raft/rafttest/network.go index f23bbb05b..0e86bf3a5 100644 --- a/raft/rafttest/network.go +++ b/raft/rafttest/network.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) // a network interface diff --git a/raft/rafttest/network_test.go b/raft/rafttest/network_test.go index a176c95fb..39447476e 100644 --- a/raft/rafttest/network_test.go +++ b/raft/rafttest/network_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func TestNetworkDrop(t *testing.T) { diff --git a/raft/rafttest/node.go b/raft/rafttest/node.go index bc3b47ab5..2dfeca530 100644 --- a/raft/rafttest/node.go +++ b/raft/rafttest/node.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" ) type node struct { diff --git a/raft/rafttest/node_bench_test.go b/raft/rafttest/node_bench_test.go index 2b505d8ef..6d69003a6 100644 --- a/raft/rafttest/node_bench_test.go +++ b/raft/rafttest/node_bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft/v3" ) func BenchmarkProposal3Nodes(b *testing.B) { diff --git a/raft/rafttest/node_test.go b/raft/rafttest/node_test.go index 3c466367b..caa0b570b 100644 --- a/raft/rafttest/node_test.go +++ b/raft/rafttest/node_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/raft" + "go.etcd.io/etcd/raft/v3" ) func TestBasicProgress(t *testing.T) { diff --git a/raft/rawnode.go b/raft/rawnode.go index a056e7206..4111d029d 100644 --- a/raft/rawnode.go +++ b/raft/rawnode.go @@ -17,8 +17,8 @@ package raft import ( "errors" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // ErrStepLocalMsg is returned when try to step a local raft message diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go index 600c03d91..7e83bc124 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/v3/raft/quorum" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + "go.etcd.io/etcd/raft/v3/quorum" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // rawNodeAdapter is essentially a lint that makes sure that RawNode implements diff --git a/raft/read_only.go b/raft/read_only.go index b25a28d19..ad0688522 100644 --- a/raft/read_only.go +++ b/raft/read_only.go @@ -14,7 +14,7 @@ package raft -import pb "go.etcd.io/etcd/v3/raft/raftpb" +import pb "go.etcd.io/etcd/raft/v3/raftpb" // ReadState provides state for read only query. // It's caller's responsibility to call ReadIndex first before getting diff --git a/raft/status.go b/raft/status.go index 9efa885e7..3098c2c73 100644 --- a/raft/status.go +++ b/raft/status.go @@ -17,8 +17,8 @@ package raft import ( "fmt" - pb "go.etcd.io/etcd/v3/raft/raftpb" - "go.etcd.io/etcd/v3/raft/tracker" + pb "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/raft/v3/tracker" ) // Status contains information about this Raft peer and its view of the system. diff --git a/raft/storage.go b/raft/storage.go index 7101eef02..4a403d017 100644 --- a/raft/storage.go +++ b/raft/storage.go @@ -18,7 +18,7 @@ import ( "errors" "sync" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) // ErrCompacted is returned by Storage.Entries/Compact when a requested diff --git a/raft/storage_test.go b/raft/storage_test.go index d67d175bd..04eb85bdf 100644 --- a/raft/storage_test.go +++ b/raft/storage_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func TestStorageTerm(t *testing.T) { diff --git a/raft/tracker/tracker.go b/raft/tracker/tracker.go index a6731d023..13a0dc094 100644 --- a/raft/tracker/tracker.go +++ b/raft/tracker/tracker.go @@ -19,8 +19,8 @@ import ( "sort" "strings" - "go.etcd.io/etcd/v3/raft/quorum" - pb "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/quorum" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) // Config reflects the configuration tracked in a ProgressTracker. diff --git a/raft/util.go b/raft/util.go index bb9c036c8..94ab368f6 100644 --- a/raft/util.go +++ b/raft/util.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) func (st StateType) MarshalJSON() ([]byte, error) { diff --git a/raft/util_test.go b/raft/util_test.go index 4c49a61ba..65bc95501 100644 --- a/raft/util_test.go +++ b/raft/util_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - pb "go.etcd.io/etcd/v3/raft/raftpb" + pb "go.etcd.io/etcd/raft/v3/raftpb" ) var testFormatter EntryFormatter = func(data []byte) string { diff --git a/server/mock/mockstorage/storage_recorder.go b/server/mock/mockstorage/storage_recorder.go index 64e13bddf..eccfff95b 100644 --- a/server/mock/mockstorage/storage_recorder.go +++ b/server/mock/mockstorage/storage_recorder.go @@ -16,8 +16,8 @@ package mockstorage import ( "go.etcd.io/etcd/pkg/v3/testutil" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" ) type storageRecorder struct { diff --git a/tests/functional/tester/stresser_key.go b/tests/functional/tester/stresser_key.go index 99ba75834..4741fb989 100644 --- a/tests/functional/tester/stresser_key.go +++ b/tests/functional/tester/stresser_key.go @@ -24,10 +24,10 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/tests/v3/functional/rpcpb" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver" - "go.etcd.io/etcd/v3/raft" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index e85539b06..f87b94d75 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/wal" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 61fe3f192..85bc07971 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -31,8 +31,8 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/types" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/etcdserver/api/snap" - "go.etcd.io/etcd/v3/raft/raftpb" "go.etcd.io/etcd/v3/wal" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" diff --git a/wal/decoder.go b/wal/decoder.go index afc8e00eb..e676a9f2c 100644 --- a/wal/decoder.go +++ b/wal/decoder.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/wal/walpb" ) diff --git a/wal/repair_test.go b/wal/repair_test.go index ae6747b6b..90f4f1e81 100644 --- a/wal/repair_test.go +++ b/wal/repair_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" diff --git a/wal/wal.go b/wal/wal.go index ced070572..45f0d9ddd 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/etcd/v3/raft" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap" diff --git a/wal/wal_bench_test.go b/wal/wal_bench_test.go index 607d02afc..3d12d2f62 100644 --- a/wal/wal_bench_test.go +++ b/wal/wal_bench_test.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" ) func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) } diff --git a/wal/wal_test.go b/wal/wal_test.go index 525473cfc..5e9547f18 100644 --- a/wal/wal_test.go +++ b/wal/wal_test.go @@ -29,7 +29,7 @@ import ( "go.etcd.io/etcd/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/v3/wal/walpb" "go.uber.org/zap"