diff --git a/server/etcdserver/api/etcdhttp/health.go b/server/etcdserver/api/etcdhttp/health.go index f50e679c0..6e4f1e70e 100644 --- a/server/etcdserver/api/etcdhttp/health.go +++ b/server/etcdserver/api/etcdhttp/health.go @@ -24,9 +24,9 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/config" + "go.etcd.io/raft/v3" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/etcdhttp/health_test.go b/server/etcdserver/api/etcdhttp/health_test.go index 575fe79af..6dfbd1b19 100644 --- a/server/etcdserver/api/etcdhttp/health_test.go +++ b/server/etcdserver/api/etcdhttp/health_test.go @@ -26,10 +26,10 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver" + "go.etcd.io/raft/v3" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/membership/cluster.go b/server/etcdserver/api/membership/cluster.go index f9da09168..31fb088f8 100644 --- a/server/etcdserver/api/membership/cluster.go +++ b/server/etcdserver/api/membership/cluster.go @@ -30,10 +30,10 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/netutil" "go.etcd.io/etcd/pkg/v3/notify" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" serverversion "go.etcd.io/etcd/server/v3/etcdserver/version" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "github.com/coreos/go-semver/semver" "github.com/prometheus/client_golang/prometheus" diff --git a/server/etcdserver/api/membership/cluster_test.go b/server/etcdserver/api/membership/cluster_test.go index dc0bfae3d..ce98472df 100644 --- a/server/etcdserver/api/membership/cluster_test.go +++ b/server/etcdserver/api/membership/cluster_test.go @@ -25,9 +25,9 @@ import ( "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/mock/mockstore" + "go.etcd.io/raft/v3/raftpb" ) func TestClusterMember(t *testing.T) { diff --git a/server/etcdserver/api/rafthttp/functional_test.go b/server/etcdserver/api/rafthttp/functional_test.go index 02d5c42ef..55e5f6e02 100644 --- a/server/etcdserver/api/rafthttp/functional_test.go +++ b/server/etcdserver/api/rafthttp/functional_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/types" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/rafthttp/http.go b/server/etcdserver/api/rafthttp/http.go index 639997f1f..6e6686b4c 100644 --- a/server/etcdserver/api/rafthttp/http.go +++ b/server/etcdserver/api/rafthttp/http.go @@ -27,8 +27,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/types" pioutil "go.etcd.io/etcd/pkg/v3/ioutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/raft/v3/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/http_test.go b/server/etcdserver/api/rafthttp/http_test.go index 700a9a7df..699cb507d 100644 --- a/server/etcdserver/api/rafthttp/http_test.go +++ b/server/etcdserver/api/rafthttp/http_test.go @@ -29,8 +29,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/rafthttp/msgappv2_codec.go b/server/etcdserver/api/rafthttp/msgappv2_codec.go index 4deb97675..59425aeea 100644 --- a/server/etcdserver/api/rafthttp/msgappv2_codec.go +++ b/server/etcdserver/api/rafthttp/msgappv2_codec.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3/raftpb" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3/raftpb" ) const ( diff --git a/server/etcdserver/api/rafthttp/msgappv2_codec_test.go b/server/etcdserver/api/rafthttp/msgappv2_codec_test.go index 0932f87f7..50c7bd25c 100644 --- a/server/etcdserver/api/rafthttp/msgappv2_codec_test.go +++ b/server/etcdserver/api/rafthttp/msgappv2_codec_test.go @@ -20,8 +20,8 @@ import ( "testing" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/server/etcdserver/api/rafthttp/peer.go b/server/etcdserver/api/rafthttp/peer.go index 3997d8106..11d17cace 100644 --- a/server/etcdserver/api/rafthttp/peer.go +++ b/server/etcdserver/api/rafthttp/peer.go @@ -20,10 +20,10 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" "golang.org/x/time/rate" diff --git a/server/etcdserver/api/rafthttp/pipeline.go b/server/etcdserver/api/rafthttp/pipeline.go index 8f51e08d3..b8ff3dfca 100644 --- a/server/etcdserver/api/rafthttp/pipeline.go +++ b/server/etcdserver/api/rafthttp/pipeline.go @@ -25,9 +25,9 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/rafthttp/pipeline_test.go b/server/etcdserver/api/rafthttp/pipeline_test.go index ae596ccdb..d1fa1b3a9 100644 --- a/server/etcdserver/api/rafthttp/pipeline_test.go +++ b/server/etcdserver/api/rafthttp/pipeline_test.go @@ -26,8 +26,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/rafthttp/snapshot_sender.go b/server/etcdserver/api/rafthttp/snapshot_sender.go index 3d299719b..9b98474fe 100644 --- a/server/etcdserver/api/rafthttp/snapshot_sender.go +++ b/server/etcdserver/api/rafthttp/snapshot_sender.go @@ -24,8 +24,8 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/httputil" pioutil "go.etcd.io/etcd/pkg/v3/ioutil" - "go.etcd.io/raft/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/raft/v3" "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/snapshot_test.go b/server/etcdserver/api/rafthttp/snapshot_test.go index 49cced01b..cc9cb5be8 100644 --- a/server/etcdserver/api/rafthttp/snapshot_test.go +++ b/server/etcdserver/api/rafthttp/snapshot_test.go @@ -25,8 +25,8 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/rafthttp/stream.go b/server/etcdserver/api/rafthttp/stream.go index 75d8f52aa..c8a1f1fb5 100644 --- a/server/etcdserver/api/rafthttp/stream.go +++ b/server/etcdserver/api/rafthttp/stream.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/httputil" - "go.etcd.io/raft/v3/raftpb" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3/raftpb" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/stream_test.go b/server/etcdserver/api/rafthttp/stream_test.go index 95398c064..ffe551c8d 100644 --- a/server/etcdserver/api/rafthttp/stream_test.go +++ b/server/etcdserver/api/rafthttp/stream_test.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" "github.com/coreos/go-semver/semver" diff --git a/server/etcdserver/api/rafthttp/transport.go b/server/etcdserver/api/rafthttp/transport.go index 9d3822e01..f4af5f3c2 100644 --- a/server/etcdserver/api/rafthttp/transport.go +++ b/server/etcdserver/api/rafthttp/transport.go @@ -22,10 +22,10 @@ import ( "go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "github.com/xiang90/probing" "go.uber.org/zap" diff --git a/server/etcdserver/api/rafthttp/transport_bench_test.go b/server/etcdserver/api/rafthttp/transport_bench_test.go index bb979e2e0..6d1e6d7e7 100644 --- a/server/etcdserver/api/rafthttp/transport_bench_test.go +++ b/server/etcdserver/api/rafthttp/transport_bench_test.go @@ -22,9 +22,9 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/types" + stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/rafthttp/transport_test.go b/server/etcdserver/api/rafthttp/transport_test.go index ee9c7c1c8..05ab30203 100644 --- a/server/etcdserver/api/rafthttp/transport_test.go +++ b/server/etcdserver/api/rafthttp/transport_test.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" "github.com/xiang90/probing" diff --git a/server/etcdserver/api/snap/snapshotter.go b/server/etcdserver/api/snap/snapshotter.go index 0ff024bf9..093ab6bc9 100644 --- a/server/etcdserver/api/snap/snapshotter.go +++ b/server/etcdserver/api/snap/snapshotter.go @@ -28,10 +28,10 @@ import ( "go.etcd.io/etcd/client/pkg/v3/verify" pioutil "go.etcd.io/etcd/pkg/v3/ioutil" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap/snappb" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/snap/snapshotter_test.go b/server/etcdserver/api/snap/snapshotter_test.go index 212ef8d55..54721624d 100644 --- a/server/etcdserver/api/snap/snapshotter_test.go +++ b/server/etcdserver/api/snap/snapshotter_test.go @@ -23,8 +23,8 @@ import ( "testing" "go.etcd.io/etcd/client/pkg/v3/fileutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/api/v3rpc/interceptor.go b/server/etcdserver/api/v3rpc/interceptor.go index ccd4af138..2ef5bba91 100644 --- a/server/etcdserver/api/v3rpc/interceptor.go +++ b/server/etcdserver/api/v3rpc/interceptor.go @@ -22,9 +22,9 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver/api" + "go.etcd.io/raft/v3" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.uber.org/zap" diff --git a/server/etcdserver/api/v3rpc/maintenance.go b/server/etcdserver/api/v3rpc/maintenance.go index 952c64f08..7ed449a6f 100644 --- a/server/etcdserver/api/v3rpc/maintenance.go +++ b/server/etcdserver/api/v3rpc/maintenance.go @@ -24,7 +24,6 @@ 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/raft/v3" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver/apply" "go.etcd.io/etcd/server/v3/etcdserver/errors" @@ -32,6 +31,7 @@ import ( "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/mvcc" "go.etcd.io/etcd/server/v3/storage/schema" + "go.etcd.io/raft/v3" "go.uber.org/zap" ) diff --git a/server/etcdserver/bootstrap.go b/server/etcdserver/bootstrap.go index 9cebfe61a..03764d028 100644 --- a/server/etcdserver/bootstrap.go +++ b/server/etcdserver/bootstrap.go @@ -32,8 +32,6 @@ import ( "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" @@ -48,6 +46,8 @@ import ( "go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) { diff --git a/server/etcdserver/bootstrap_test.go b/server/etcdserver/bootstrap_test.go index b41e2d5b8..d3a241385 100644 --- a/server/etcdserver/bootstrap_test.go +++ b/server/etcdserver/bootstrap_test.go @@ -37,12 +37,12 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" serverstorage "go.etcd.io/etcd/server/v3/storage" + "go.etcd.io/raft/v3/raftpb" ) func TestBootstrapExistingClusterNoWALMaxLearner(t *testing.T) { diff --git a/server/etcdserver/raft.go b/server/etcdserver/raft.go index 45f056f4c..9496c1b73 100644 --- a/server/etcdserver/raft.go +++ b/server/etcdserver/raft.go @@ -23,10 +23,10 @@ import ( "go.etcd.io/etcd/client/pkg/v3/logutil" "go.etcd.io/etcd/pkg/v3/contention" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" serverstorage "go.etcd.io/etcd/server/v3/storage" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/raft_test.go b/server/etcdserver/raft_test.go index 969d52815..7c017ccc2 100644 --- a/server/etcdserver/raft_test.go +++ b/server/etcdserver/raft_test.go @@ -24,11 +24,11 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/mock/mockstorage" serverstorage "go.etcd.io/etcd/server/v3/storage" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go index 905a3861e..aee081a0c 100644 --- a/server/etcdserver/server.go +++ b/server/etcdserver/server.go @@ -50,8 +50,6 @@ import ( "go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/wait" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/etcdserver/api" httptypes "go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/types" @@ -70,6 +68,8 @@ import ( "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/mvcc" "go.etcd.io/etcd/server/v3/storage/schema" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) const ( diff --git a/server/etcdserver/server_test.go b/server/etcdserver/server_test.go index 4d2e6604c..8d740dcbb 100644 --- a/server/etcdserver/server_test.go +++ b/server/etcdserver/server_test.go @@ -38,8 +38,6 @@ import ( "go.etcd.io/etcd/pkg/v3/idutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/pkg/v3/wait" - "go.etcd.io/raft/v3" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" @@ -57,6 +55,8 @@ import ( betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/mvcc" "go.etcd.io/etcd/server/v3/storage/schema" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/snapshot_merge.go b/server/etcdserver/snapshot_merge.go index a02a309e1..963ead5a7 100644 --- a/server/etcdserver/snapshot_merge.go +++ b/server/etcdserver/snapshot_merge.go @@ -17,9 +17,9 @@ package etcdserver import ( "io" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/raft/v3/raftpb" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/util_test.go b/server/etcdserver/util_test.go index 7b377f442..cad7c3cf4 100644 --- a/server/etcdserver/util_test.go +++ b/server/etcdserver/util_test.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap/zaptest" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" + "go.etcd.io/raft/v3/raftpb" ) func TestLongestConnected(t *testing.T) { diff --git a/server/etcdserver/v3_server.go b/server/etcdserver/v3_server.go index 0cb93974d..4f1cd6b13 100644 --- a/server/etcdserver/v3_server.go +++ b/server/etcdserver/v3_server.go @@ -25,7 +25,6 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/raft/v3" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" apply2 "go.etcd.io/etcd/server/v3/etcdserver/apply" @@ -34,6 +33,7 @@ import ( "go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease/leasehttp" "go.etcd.io/etcd/server/v3/storage/mvcc" + "go.etcd.io/raft/v3" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/server/storage/backend.go b/server/storage/backend.go index 0b80a2ad0..a93fd8a3f 100644 --- a/server/storage/backend.go +++ b/server/storage/backend.go @@ -19,11 +19,11 @@ import ( "os" "time" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/schema" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/server/storage/schema/confstate.go b/server/storage/schema/confstate.go index 1c6dfd7ef..21752b793 100644 --- a/server/storage/schema/confstate.go +++ b/server/storage/schema/confstate.go @@ -18,8 +18,8 @@ import ( "encoding/json" "log" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/server/storage/schema/confstate_test.go b/server/storage/schema/confstate_test.go index 2ca8f8514..653bf59c5 100644 --- a/server/storage/schema/confstate_test.go +++ b/server/storage/schema/confstate_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.etcd.io/raft/v3/raftpb" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/storage/schema/schema_test.go b/server/storage/schema/schema_test.go index 28fa6a6e6..87d359fa1 100644 --- a/server/storage/schema/schema_test.go +++ b/server/storage/schema/schema_test.go @@ -23,11 +23,11 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/api/v3/version" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/wal" waltesting "go.etcd.io/etcd/server/v3/storage/wal/testing" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/server/storage/storage.go b/server/storage/storage.go index acb5135f1..ea815722a 100644 --- a/server/storage/storage.go +++ b/server/storage/storage.go @@ -18,10 +18,10 @@ import ( "sync" "github.com/coreos/go-semver/semver" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" ) diff --git a/server/storage/util.go b/server/storage/util.go index 67beb8400..e1996cfe5 100644 --- a/server/storage/util.go +++ b/server/storage/util.go @@ -23,10 +23,10 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" + "go.etcd.io/raft/v3/raftpb" ) // AssertNoV2StoreContent -> depending on the deprecation stage, warns or report an error diff --git a/server/storage/wal/decoder.go b/server/storage/wal/decoder.go index 8109de273..dde15ed07 100644 --- a/server/storage/wal/decoder.go +++ b/server/storage/wal/decoder.go @@ -24,8 +24,8 @@ import ( "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" ) const minSectorSize = 512 diff --git a/server/storage/wal/repair_test.go b/server/storage/wal/repair_test.go index 9c72484a9..2da9142db 100644 --- a/server/storage/wal/repair_test.go +++ b/server/storage/wal/repair_test.go @@ -20,8 +20,8 @@ import ( "os" "testing" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/storage/wal/testing/waltesting.go b/server/storage/wal/testing/waltesting.go index b7afa7f2f..d936bf730 100644 --- a/server/storage/wal/testing/waltesting.go +++ b/server/storage/wal/testing/waltesting.go @@ -21,9 +21,9 @@ import ( "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/storage/wal/wal.go b/server/storage/wal/wal.go index 857c64184..145a1a305 100644 --- a/server/storage/wal/wal.go +++ b/server/storage/wal/wal.go @@ -28,9 +28,9 @@ import ( "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/server/storage/wal/wal_test.go b/server/storage/wal/wal_test.go index d4f595044..c74f82a85 100644 --- a/server/storage/wal/wal_test.go +++ b/server/storage/wal/wal_test.go @@ -32,8 +32,8 @@ import ( "github.com/stretchr/testify/assert" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" ) diff --git a/server/verify/verify.go b/server/verify/verify.go index 73b50a9bb..2accdd217 100644 --- a/server/verify/verify.go +++ b/server/verify/verify.go @@ -18,12 +18,12 @@ import ( "fmt" "go.etcd.io/etcd/client/pkg/v3/verify" - "go.etcd.io/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/schema" wal2 "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap" )