From a94858bff9a53450e0c76ff8ed8757fd3d18a264 Mon Sep 17 00:00:00 2001 From: Pavel Kalinnikov Date: Wed, 7 Dec 2022 01:25:33 +0000 Subject: [PATCH] go.mod: import etcd/raft at the new path The etcd/raft package has moved to a separate repository, and was renamed to go.etcd.io/raft. This commit imports the new path. Epic: none tmp --- BUILD.bazel | 4 ++-- DEPS.bzl | 12 ++++++------ build/bazelutil/distdir_files.bzl | 2 +- docs/generated/http/BUILD.bazel | 2 +- docs/generated/http/full.md | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- pkg/cli/BUILD.bazel | 2 +- pkg/cli/debug_check_store.go | 2 +- pkg/cmd/mirror/mirror.go | 6 +++--- pkg/cmd/protoc-gen-gogoroach/BUILD.bazel | 4 ++-- pkg/cmd/protoc-gen-gogoroach/main.go | 2 +- pkg/kv/kvserver/BUILD.bazel | 14 +++++++------- pkg/kv/kvserver/allocator/BUILD.bazel | 2 +- .../kvserver/allocator/allocatorimpl/BUILD.bazel | 8 ++++---- .../kvserver/allocator/allocatorimpl/allocator.go | 4 ++-- .../allocator/allocatorimpl/allocator_test.go | 4 ++-- pkg/kv/kvserver/allocator/base.go | 2 +- pkg/kv/kvserver/allocator_impl_test.go | 4 ++-- pkg/kv/kvserver/apply/BUILD.bazel | 4 ++-- pkg/kv/kvserver/apply/task.go | 2 +- pkg/kv/kvserver/apply/task_test.go | 2 +- pkg/kv/kvserver/asim/state/BUILD.bazel | 4 ++-- pkg/kv/kvserver/asim/state/impl.go | 4 ++-- pkg/kv/kvserver/asim/state/state.go | 2 +- pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel | 2 +- .../asim/storerebalancer/candidate_replica.go | 2 +- .../asim/storerebalancer/store_rebalancer.go | 2 +- pkg/kv/kvserver/below_raft_protos_test.go | 2 +- .../client_atomic_membership_change_test.go | 4 ++-- pkg/kv/kvserver/client_lease_test.go | 4 ++-- pkg/kv/kvserver/client_merge_test.go | 2 +- pkg/kv/kvserver/client_raft_helpers_test.go | 2 +- pkg/kv/kvserver/client_raft_test.go | 4 ++-- pkg/kv/kvserver/client_replica_test.go | 2 +- pkg/kv/kvserver/client_split_test.go | 2 +- pkg/kv/kvserver/debug_print.go | 2 +- pkg/kv/kvserver/helpers_test.go | 2 +- pkg/kv/kvserver/kvserverpb/BUILD.bazel | 4 ++-- pkg/kv/kvserver/kvserverpb/raft.proto | 2 +- pkg/kv/kvserver/logstore/BUILD.bazel | 6 +++--- pkg/kv/kvserver/logstore/logstore.go | 4 ++-- pkg/kv/kvserver/logstore/logstore_bench_test.go | 2 +- pkg/kv/kvserver/logstore/sideload.go | 2 +- pkg/kv/kvserver/logstore/sideload_test.go | 2 +- pkg/kv/kvserver/logstore/stateloader.go | 2 +- pkg/kv/kvserver/loqrecovery/BUILD.bazel | 4 ++-- pkg/kv/kvserver/loqrecovery/collect.go | 2 +- pkg/kv/kvserver/loqrecovery/recovery_env_test.go | 2 +- pkg/kv/kvserver/metrics.go | 2 +- pkg/kv/kvserver/raft.go | 4 ++-- pkg/kv/kvserver/raft_log_queue.go | 4 ++-- pkg/kv/kvserver/raft_log_queue_test.go | 4 ++-- pkg/kv/kvserver/raft_snapshot_queue.go | 2 +- pkg/kv/kvserver/raft_transport.go | 2 +- pkg/kv/kvserver/raft_transport_test.go | 2 +- pkg/kv/kvserver/raftentry/BUILD.bazel | 4 ++-- pkg/kv/kvserver/raftentry/cache.go | 2 +- pkg/kv/kvserver/raftentry/cache_test.go | 2 +- pkg/kv/kvserver/raftentry/ring_buffer.go | 2 +- pkg/kv/kvserver/raftlog/BUILD.bazel | 4 ++-- pkg/kv/kvserver/raftlog/command.go | 2 +- pkg/kv/kvserver/raftlog/entry.go | 2 +- pkg/kv/kvserver/raftlog/entry_test.go | 2 +- pkg/kv/kvserver/raftlog/iter_bench_test.go | 2 +- pkg/kv/kvserver/raftlog/iter_test.go | 2 +- pkg/kv/kvserver/raftlog/iterator.go | 2 +- pkg/kv/kvserver/raftutil/BUILD.bazel | 8 ++++---- pkg/kv/kvserver/raftutil/util.go | 4 ++-- pkg/kv/kvserver/raftutil/util_test.go | 4 ++-- pkg/kv/kvserver/replica.go | 2 +- pkg/kv/kvserver/replica_application_decoder.go | 2 +- .../kvserver/replica_application_state_machine.go | 2 +- .../replica_application_state_machine_test.go | 2 +- pkg/kv/kvserver/replica_circuit_breaker.go | 2 +- pkg/kv/kvserver/replica_circuit_breaker_test.go | 2 +- pkg/kv/kvserver/replica_command.go | 6 +++--- pkg/kv/kvserver/replica_gc_queue.go | 2 +- pkg/kv/kvserver/replica_init.go | 2 +- pkg/kv/kvserver/replica_metrics.go | 2 +- pkg/kv/kvserver/replica_proposal_buf.go | 4 ++-- pkg/kv/kvserver/replica_proposal_buf_test.go | 6 +++--- pkg/kv/kvserver/replica_proposal_quota.go | 4 ++-- pkg/kv/kvserver/replica_raft.go | 6 +++--- pkg/kv/kvserver/replica_raft_overload.go | 2 +- pkg/kv/kvserver/replica_raft_overload_test.go | 2 +- pkg/kv/kvserver/replica_raft_quiesce.go | 4 ++-- pkg/kv/kvserver/replica_raft_test.go | 2 +- pkg/kv/kvserver/replica_raftstorage.go | 4 ++-- pkg/kv/kvserver/replica_rangefeed_test.go | 4 ++-- pkg/kv/kvserver/replica_rankings.go | 2 +- pkg/kv/kvserver/replica_test.go | 6 +++--- pkg/kv/kvserver/replicate_queue.go | 2 +- pkg/kv/kvserver/replicate_queue_test.go | 2 +- pkg/kv/kvserver/split_delay_helper.go | 4 ++-- pkg/kv/kvserver/split_delay_helper_test.go | 4 ++-- pkg/kv/kvserver/split_trigger_helper.go | 2 +- pkg/kv/kvserver/split_trigger_helper_test.go | 2 +- pkg/kv/kvserver/stateloader/BUILD.bazel | 2 +- pkg/kv/kvserver/stateloader/initial_test.go | 2 +- pkg/kv/kvserver/store.go | 2 +- pkg/kv/kvserver/store_raft.go | 2 +- pkg/kv/kvserver/store_raft_test.go | 2 +- pkg/kv/kvserver/store_rebalancer.go | 2 +- pkg/kv/kvserver/store_rebalancer_test.go | 4 ++-- pkg/kv/kvserver/store_snapshot.go | 2 +- pkg/kv/kvserver/store_split.go | 4 ++-- pkg/kv/kvserver/store_test.go | 4 ++-- pkg/roachpb/BUILD.bazel | 12 ++++++------ pkg/roachpb/data.go | 2 +- pkg/roachpb/data_test.go | 2 +- pkg/roachpb/metadata_replicas.go | 2 +- pkg/roachpb/metadata_replicas_test.go | 8 ++++---- pkg/rpc/BUILD.bazel | 2 +- pkg/rpc/codec_test.go | 2 +- pkg/server/BUILD.bazel | 2 +- pkg/server/serverpb/BUILD.bazel | 4 ++-- pkg/server/serverpb/status.proto | 4 ++-- pkg/server/status.go | 2 +- pkg/storage/BUILD.bazel | 2 +- pkg/storage/replicas_storage.go | 2 +- pkg/testutils/lint/passes/fmtsafe/functions.go | 12 ++++++------ .../lint/passes/fmtsafe/testdata/src/a/a.go | 2 +- .../src/go.etcd.io/{etcd => }/raft/v3/log.go | 0 pkg/testutils/testcluster/BUILD.bazel | 2 +- pkg/testutils/testcluster/testcluster.go | 2 +- 126 files changed, 203 insertions(+), 203 deletions(-) rename pkg/testutils/lint/passes/fmtsafe/testdata/src/go.etcd.io/{etcd => }/raft/v3/log.go (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 45576ecab035..50aa5dead6a2 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -42,8 +42,8 @@ exports_files([ # gazelle:resolve go github.com/grpc-ecosystem/grpc-gateway/internal @com_github_grpc_ecosystem_grpc_gateway//internal # gazelle:resolve proto proto errorspb/errors.proto @com_github_cockroachdb_errors//errorspb:errorspb_proto # gazelle:resolve proto go errorspb/errors.proto @com_github_cockroachdb_errors//errorspb -# gazelle:resolve proto proto etcd/raft/v3/raftpb/raft.proto @io_etcd_go_etcd_raft_v3//raftpb:raftpb_proto -# gazelle:resolve proto go etcd/raft/v3/raftpb/raft.proto @io_etcd_go_etcd_raft_v3//raftpb +# gazelle:resolve proto proto raft/v3/raftpb/raft.proto @io_etcd_go_raft_v3//raftpb:raftpb_proto +# gazelle:resolve proto go raft/v3/raftpb/raft.proto @io_etcd_go_raft_v3//raftpb # gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto # gazelle:resolve proto go gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto # gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto//googleapis/api/annotations:go_default_library diff --git a/DEPS.bzl b/DEPS.bzl index 034144dfdfdb..ff504369ed8b 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -8991,20 +8991,20 @@ def go_deps(): ], ) go_repository( - name = "io_etcd_go_etcd_raft_v3", + name = "io_etcd_go_raft_v3", build_directives = [ "gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto", "gazelle:resolve proto go gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto", "gazelle:go_proto_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler", "gazelle:go_grpc_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler", - "gazelle:proto_import_prefix etcd/raft/v3", + "gazelle:proto_import_prefix raft/v3", ], build_file_proto_mode = "default", - importpath = "go.etcd.io/etcd/raft/v3", - sha256 = "7adb6472d613832b1817be14f87b171043c3e91f13376f2077aeb710bae976b8", - strip_prefix = "go.etcd.io/etcd/raft/v3@v3.6.0-alpha.0.0.20221202061758-8651478ce2bc", + importpath = "go.etcd.io/raft/v3", + sha256 = "61cb8ce8d354ee2f7f809b74b3f92aab0e1f6fbecdd751239368085a57ee004f", + strip_prefix = "go.etcd.io/raft/v3@v3.0.0-20221201111702-eaa6808e1f7a", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/raft/v3/io_etcd_go_etcd_raft_v3-v3.6.0-alpha.0.0.20221202061758-8651478ce2bc.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/raft/v3/io_etcd_go_raft_v3-v3.0.0-20221201111702-eaa6808e1f7a.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 11f49609de58..9eb1a8adccbb 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -864,7 +864,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/pkg/v3/io_etcd_go_etcd_client_pkg_v3-v3.5.0.zip": "c0ca209767c5734c6ed023888ba5be02aab5bd3c4d018999467f2bfa8bf65ee3", "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/v2/io_etcd_go_etcd_client_v2-v2.305.0.zip": "91fcb507fe8c193844b56bfb6c8741aaeb6ffa11ee9043de2af0f141173679f3", "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/io_etcd_go_etcd-v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip": "d982ee501979b41b68625693bad77d15e4ae79ab9d0eae5f6028205f96a74e49", - "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/raft/v3/io_etcd_go_etcd_raft_v3-v3.6.0-alpha.0.0.20221202061758-8651478ce2bc.zip": "7adb6472d613832b1817be14f87b171043c3e91f13376f2077aeb710bae976b8", + "https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/raft/v3/io_etcd_go_raft_v3-v3.0.0-20221201111702-eaa6808e1f7a.zip": "61cb8ce8d354ee2f7f809b74b3f92aab0e1f6fbecdd751239368085a57ee004f", "https://storage.googleapis.com/cockroach-godeps/gomod/go.mongodb.org/mongo-driver/org_mongodb_go_mongo_driver-v1.5.1.zip": "446cff132e82c64af7ffcf48e268eb16ec81f694914aa6baecb06cbbae1be0d7", "https://storage.googleapis.com/cockroach-godeps/gomod/go.mozilla.org/pkcs7/org_mozilla_go_pkcs7-v0.0.0-20200128120323-432b2356ecb1.zip": "3c4c1667907ff3127e371d44696326bad9e965216d4257917ae28e8b82a9e08d", "https://storage.googleapis.com/cockroach-godeps/gomod/go.opencensus.io/io_opencensus_go-v0.23.0.zip": "81c78beb84872084d6d5ddc0a0bffc47294412898472c891a29cfcb66f3fa2d8", diff --git a/docs/generated/http/BUILD.bazel b/docs/generated/http/BUILD.bazel index d6624b2ca3c9..bd6a3627804a 100644 --- a/docs/generated/http/BUILD.bazel +++ b/docs/generated/http/BUILD.bazel @@ -48,7 +48,7 @@ genrule( "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:timestamp_proto", "@go_googleapis//google/api:annotations_proto", - "@io_etcd_go_etcd_raft_v3//raftpb:raftpb_proto", + "@io_etcd_go_raft_v3//raftpb:raftpb_proto", ], outs = [ "full.md", diff --git a/docs/generated/http/full.md b/docs/generated/http/full.md index 5cb890718da5..a7c840fa75ae 100644 --- a/docs/generated/http/full.md +++ b/docs/generated/http/full.md @@ -1246,7 +1246,7 @@ Support status: [reserved](#support-status) #### RaftState RaftState gives internal details about a Raft group's state. -Closely mirrors the upstream definitions in github.com/etcd-io/etcd/raft. +Closely mirrors the upstream definitions in github.com/etcd-io/raft. | Field | Type | Label | Description | Support status | | ----- | ---- | ----- | ----------- | -------------- | @@ -1492,7 +1492,7 @@ Support status: [reserved](#support-status) #### RaftState RaftState gives internal details about a Raft group's state. -Closely mirrors the upstream definitions in github.com/etcd-io/etcd/raft. +Closely mirrors the upstream definitions in github.com/etcd-io/raft. | Field | Type | Label | Description | Support status | | ----- | ---- | ----- | ----------- | -------------- | @@ -3710,7 +3710,7 @@ Support status: [reserved](#support-status) #### RaftState RaftState gives internal details about a Raft group's state. -Closely mirrors the upstream definitions in github.com/etcd-io/etcd/raft. +Closely mirrors the upstream definitions in github.com/etcd-io/raft. | Field | Type | Label | Description | Support status | | ----- | ---- | ----- | ----------- | -------------- | diff --git a/go.mod b/go.mod index 148a6b238d9f..f3f01cee4726 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,6 @@ require ( github.com/google/btree v1.0.1 github.com/google/pprof v0.0.0-20210827144239-02619b876842 github.com/google/uuid v1.3.0 - go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221202061758-8651478ce2bc golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 golang.org/x/exp v0.0.0-20220104160115-025e73f80486 golang.org/x/exp/typeparams v0.0.0-20220713135740-79cabaa25d75 // indirect @@ -208,6 +207,7 @@ require ( github.com/xdg-go/scram v1.0.2 github.com/xdg-go/stringprep v1.0.2 github.com/zabawaba99/go-gitignore v0.0.0-20200117185801-39e6bddfb292 + go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a go.opentelemetry.io/otel v1.0.0-RC3 go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC3 diff --git a/go.sum b/go.sum index d5108b96dd28..210696d63f10 100644 --- a/go.sum +++ b/go.sum @@ -2263,8 +2263,8 @@ go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3C go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221202061758-8651478ce2bc h1:FhWWEmkJZ4C+U5z8EeNfaRQ1jWakRvFwPSXNO/96pA4= -go.etcd.io/etcd/raft/v3 v3.6.0-alpha.0.0.20221202061758-8651478ce2bc/go.mod h1:mXtYCG30wr2Hn2qRurHKWQUkn5E4BWhcUpzACb3C9hw= +go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a h1:Znv2XJyAf/fsJsFNt9toO8uyXwwHQ44wxqsvdSxipj4= +go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a/go.mod h1:eMshmuwXLWZrjHXN8ZgYrOMQRSbHqi5M84DEZWhG+o4= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= diff --git a/pkg/cli/BUILD.bazel b/pkg/cli/BUILD.bazel index 7855bda0aa5a..167590c11634 100644 --- a/pkg/cli/BUILD.bazel +++ b/pkg/cli/BUILD.bazel @@ -245,7 +245,7 @@ go_library( "@com_github_spf13_cobra//doc", "@com_github_spf13_pflag//:pflag", "@in_gopkg_yaml_v2//:yaml_v2", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//status", diff --git a/pkg/cli/debug_check_store.go b/pkg/cli/debug_check_store.go index dec1ecece9be..68de28c9061f 100644 --- a/pkg/cli/debug_check_store.go +++ b/pkg/cli/debug_check_store.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/errors" "github.com/kr/pretty" "github.com/spf13/cobra" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/mirror/mirror.go b/pkg/cmd/mirror/mirror.go index 3bff4fdf5551..9f5acbdc50f7 100644 --- a/pkg/cmd/mirror/mirror.go +++ b/pkg/cmd/mirror/mirror.go @@ -258,7 +258,7 @@ func buildFileProtoModeForRepo(repoName string) string { // Only generate code for protos in these three directories. if repoName == "com_github_cockroachdb_errors" || repoName == "com_github_prometheus_client_model" || - repoName == "io_etcd_go_etcd_raft_v3" { + repoName == "io_etcd_go_raft_v3" { return "default" } return "disable_global" @@ -282,10 +282,10 @@ func dumpBuildDirectivesForRepo(repoName string) { } else if repoName == "com_github_prometheus_client_model" { directives = append(directives, "gazelle:resolve go go github.com/golang/protobuf/ptypes/timestamp @com_github_golang_protobuf//ptypes/timestamp:go_default_library") - } else if repoName == "io_etcd_go_etcd_raft_v3" { + } else if repoName == "io_etcd_go_raft_v3" { directives = append(directives, protoDirectives...) directives = append(directives, - "gazelle:proto_import_prefix etcd/raft/v3") + "gazelle:proto_import_prefix raft/v3") } else if repoName == "io_opentelemetry_go_proto_otlp" { directives = append(directives, diff --git a/pkg/cmd/protoc-gen-gogoroach/BUILD.bazel b/pkg/cmd/protoc-gen-gogoroach/BUILD.bazel index af12849a0212..124078eaf2e0 100644 --- a/pkg/cmd/protoc-gen-gogoroach/BUILD.bazel +++ b/pkg/cmd/protoc-gen-gogoroach/BUILD.bazel @@ -32,7 +32,7 @@ go_proto_compiler( # the protoc invocation in the Makefile, with a couple custom options # that fix compilation errors under Bazel as well. Without the # -M options, the generated code will import the wrong go packages. - "Metcd/raft/v3/raftpb/raft.proto=go.etcd.io/etcd/raft/v3/raftpb", + "Mraft/v3/raftpb/raft.proto=go.etcd.io/raft/v3/raftpb", "Merrorspb/errors.proto=github.com/cockroachdb/errors/errorspb", "Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types", "Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types", @@ -54,7 +54,7 @@ go_proto_compiler( name = "protoc-gen-gogoroach_grpc_compiler", options = [ "plugins=grpc", - "Metcd/raft/v3/raftpb/raft.proto=go.etcd.io/etcd/raft/v3/raftpb", + "Mraft/v3/raftpb/raft.proto=go.etcd.io/raft/v3/raftpb", "Merrorspb/errors.proto=github.com/cockroachdb/errors/errorspb", "Mgoogle/api/annotations.proto=google.golang.org/genproto/googleapis/api/annotations", "Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types", diff --git a/pkg/cmd/protoc-gen-gogoroach/main.go b/pkg/cmd/protoc-gen-gogoroach/main.go index 4fc5515d43d4..77245f878f8c 100644 --- a/pkg/cmd/protoc-gen-gogoroach/main.go +++ b/pkg/cmd/protoc-gen-gogoroach/main.go @@ -34,7 +34,7 @@ func fixImports(s string) string { continue } - line = strings.ReplaceAll(line, "github.com/cockroachdb/cockroach/pkg/etcd", "go.etcd.io/etcd") + line = strings.ReplaceAll(line, "github.com/cockroachdb/cockroach/pkg/raft", "go.etcd.io/raft") line = strings.ReplaceAll(line, "github.com/cockroachdb/cockroach/pkg/errorspb", "github.com/cockroachdb/errors/errorspb") line = strings.ReplaceAll(line, "golang.org/x/net/context", "context") if builtinRegex.MatchString(line) { diff --git a/pkg/kv/kvserver/BUILD.bazel b/pkg/kv/kvserver/BUILD.bazel index 7463f349ac22..faac33fd1b3d 100644 --- a/pkg/kv/kvserver/BUILD.bazel +++ b/pkg/kv/kvserver/BUILD.bazel @@ -207,9 +207,9 @@ go_library( "@com_github_google_btree//:btree", "@com_github_kr_pretty//:pretty", "@com_github_prometheus_client_model//go", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//raftpb", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//raftpb", + "@io_etcd_go_raft_v3//tracker", "@io_opentelemetry_go_otel//attribute", "@org_golang_google_grpc//:go_default_library", "@org_golang_x_time//rate", @@ -450,10 +450,10 @@ go_test( "@com_github_lib_pq//:pq", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//confchange", - "@io_etcd_go_etcd_raft_v3//raftpb", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//confchange", + "@io_etcd_go_raft_v3//raftpb", + "@io_etcd_go_raft_v3//tracker", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//metadata", "@org_golang_x_net//trace", diff --git a/pkg/kv/kvserver/allocator/BUILD.bazel b/pkg/kv/kvserver/allocator/BUILD.bazel index f43df1a633de..30f89ec54d60 100644 --- a/pkg/kv/kvserver/allocator/BUILD.bazel +++ b/pkg/kv/kvserver/allocator/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "//pkg/roachpb", "//pkg/settings", "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//:raft", + "@io_etcd_go_raft_v3//:raft", ], ) diff --git a/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel b/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel index 6377ce16229e..acd846c07022 100644 --- a/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel +++ b/pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel @@ -27,8 +27,8 @@ go_library( "//pkg/util/syncutil", "//pkg/util/timeutil", "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//tracker", ], ) @@ -68,8 +68,8 @@ go_test( "@com_github_olekukonko_tablewriter//:tablewriter", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//tracker", ], ) diff --git a/pkg/kv/kvserver/allocator/allocatorimpl/allocator.go b/pkg/kv/kvserver/allocator/allocatorimpl/allocator.go index 6711804360b1..a1abf47f546c 100644 --- a/pkg/kv/kvserver/allocator/allocatorimpl/allocator.go +++ b/pkg/kv/kvserver/allocator/allocatorimpl/allocator.go @@ -31,8 +31,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) const ( diff --git a/pkg/kv/kvserver/allocator/allocatorimpl/allocator_test.go b/pkg/kv/kvserver/allocator/allocatorimpl/allocator_test.go index 293276eda7eb..3f1c1f0658a2 100644 --- a/pkg/kv/kvserver/allocator/allocatorimpl/allocator_test.go +++ b/pkg/kv/kvserver/allocator/allocatorimpl/allocator_test.go @@ -48,8 +48,8 @@ import ( "github.com/olekukonko/tablewriter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) var simpleSpanConfig = roachpb.SpanConfig{ diff --git a/pkg/kv/kvserver/allocator/base.go b/pkg/kv/kvserver/allocator/base.go index 33dcc250a962..546a6ea82a9f 100644 --- a/pkg/kv/kvserver/allocator/base.go +++ b/pkg/kv/kvserver/allocator/base.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) const ( diff --git a/pkg/kv/kvserver/allocator_impl_test.go b/pkg/kv/kvserver/allocator_impl_test.go index 3f2a90729e84..16472a13da0e 100644 --- a/pkg/kv/kvserver/allocator_impl_test.go +++ b/pkg/kv/kvserver/allocator_impl_test.go @@ -25,8 +25,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) const firstRangeID = roachpb.RangeID(1) diff --git a/pkg/kv/kvserver/apply/BUILD.bazel b/pkg/kv/kvserver/apply/BUILD.bazel index 743f8bfa00f0..3ff451e07b8a 100644 --- a/pkg/kv/kvserver/apply/BUILD.bazel +++ b/pkg/kv/kvserver/apply/BUILD.bazel @@ -12,7 +12,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) @@ -28,7 +28,7 @@ go_test( ":apply", "@com_github_cockroachdb_errors//:errors", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/kv/kvserver/apply/task.go b/pkg/kv/kvserver/apply/task.go index 6001adcf3abe..11cb2927320a 100644 --- a/pkg/kv/kvserver/apply/task.go +++ b/pkg/kv/kvserver/apply/task.go @@ -14,7 +14,7 @@ import ( "context" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // StateMachine represents an instance of a replicated state machine being diff --git a/pkg/kv/kvserver/apply/task_test.go b/pkg/kv/kvserver/apply/task_test.go index 4af9fe5da910..a970173e524f 100644 --- a/pkg/kv/kvserver/apply/task_test.go +++ b/pkg/kv/kvserver/apply/task_test.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // logging is used for Example. diff --git a/pkg/kv/kvserver/asim/state/BUILD.bazel b/pkg/kv/kvserver/asim/state/BUILD.bazel index e060d5062f62..4de663f39177 100644 --- a/pkg/kv/kvserver/asim/state/BUILD.bazel +++ b/pkg/kv/kvserver/asim/state/BUILD.bazel @@ -34,8 +34,8 @@ go_library( "//pkg/util/stop", "//pkg/util/timeutil", "@com_github_google_btree//:btree", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//tracker", ], ) diff --git a/pkg/kv/kvserver/asim/state/impl.go b/pkg/kv/kvserver/asim/state/impl.go index 2ae6cee60b07..b50d53901dd9 100644 --- a/pkg/kv/kvserver/asim/state/impl.go +++ b/pkg/kv/kvserver/asim/state/impl.go @@ -27,8 +27,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/google/btree" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) type state struct { diff --git a/pkg/kv/kvserver/asim/state/state.go b/pkg/kv/kvserver/asim/state/state.go index 93a5851e0550..68c7eb3a51da 100644 --- a/pkg/kv/kvserver/asim/state/state.go +++ b/pkg/kv/kvserver/asim/state/state.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/asim/workload" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) type ( diff --git a/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel b/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel index d33bac99242b..315c36b7168d 100644 --- a/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel +++ b/pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "//pkg/roachpb", "//pkg/util/hlc", "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//:raft", + "@io_etcd_go_raft_v3//:raft", ], ) diff --git a/pkg/kv/kvserver/asim/storerebalancer/candidate_replica.go b/pkg/kv/kvserver/asim/storerebalancer/candidate_replica.go index 6bf595196e4f..7747147d631e 100644 --- a/pkg/kv/kvserver/asim/storerebalancer/candidate_replica.go +++ b/pkg/kv/kvserver/asim/storerebalancer/candidate_replica.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) // simulatorReplica is a replica that is being tracked as a potential candidate diff --git a/pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go b/pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go index 6e0644293a68..cfd8ae408a08 100644 --- a/pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go +++ b/pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/asim/op" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/asim/state" "github.com/cockroachdb/cockroach/pkg/roachpb" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) // storeRebalancerPhase represents the current phase the store rebalancer is diff --git a/pkg/kv/kvserver/below_raft_protos_test.go b/pkg/kv/kvserver/below_raft_protos_test.go index 60a8be7cbbf9..89b0d8499b44 100644 --- a/pkg/kv/kvserver/below_raft_protos_test.go +++ b/pkg/kv/kvserver/below_raft_protos_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // TestBelowRaftProtosDontChange is a manually curated list of protos that we diff --git a/pkg/kv/kvserver/client_atomic_membership_change_test.go b/pkg/kv/kvserver/client_atomic_membership_change_test.go index b46206a7f61a..c331f5b3f310 100644 --- a/pkg/kv/kvserver/client_atomic_membership_change_test.go +++ b/pkg/kv/kvserver/client_atomic_membership_change_test.go @@ -26,8 +26,8 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/confchange" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3/confchange" + "go.etcd.io/raft/v3/tracker" ) // TestAtomicReplicationChange is a simple smoke test for atomic membership diff --git a/pkg/kv/kvserver/client_lease_test.go b/pkg/kv/kvserver/client_lease_test.go index 8b07c933c606..284a7429058f 100644 --- a/pkg/kv/kvserver/client_lease_test.go +++ b/pkg/kv/kvserver/client_lease_test.go @@ -45,8 +45,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) // TestStoreRangeLease verifies that regular ranges (not some special ones at diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go index 8b8dc45010bd..ff09ac7aeacd 100644 --- a/pkg/kv/kvserver/client_merge_test.go +++ b/pkg/kv/kvserver/client_merge_test.go @@ -61,7 +61,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) func adminMergeArgs(key roachpb.Key) *roachpb.AdminMergeRequest { diff --git a/pkg/kv/kvserver/client_raft_helpers_test.go b/pkg/kv/kvserver/client_raft_helpers_test.go index faaf20b7044c..84a1fff66b2d 100644 --- a/pkg/kv/kvserver/client_raft_helpers_test.go +++ b/pkg/kv/kvserver/client_raft_helpers_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) type unreliableRaftHandlerFuncs struct { diff --git a/pkg/kv/kvserver/client_raft_test.go b/pkg/kv/kvserver/client_raft_test.go index efe76ed4443b..5ec94f847a12 100644 --- a/pkg/kv/kvserver/client_raft_test.go +++ b/pkg/kv/kvserver/client_raft_test.go @@ -62,8 +62,8 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - raft "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + raft "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "google.golang.org/grpc" ) diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go index 1e7607ec35b1..9d20c34f536f 100644 --- a/pkg/kv/kvserver/client_replica_test.go +++ b/pkg/kv/kvserver/client_replica_test.go @@ -67,7 +67,7 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // TestReplicaClockUpdates verifies that the leaseholder updates its clocks diff --git a/pkg/kv/kvserver/client_split_test.go b/pkg/kv/kvserver/client_split_test.go index b8dd7e4c0c67..944a1cdee8b4 100644 --- a/pkg/kv/kvserver/client_split_test.go +++ b/pkg/kv/kvserver/client_split_test.go @@ -65,7 +65,7 @@ import ( "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // adminSplitArgs creates an AdminSplitRequest for the provided split key. diff --git a/pkg/kv/kvserver/debug_print.go b/pkg/kv/kvserver/debug_print.go index 4a512dd94287..3803c080afbc 100644 --- a/pkg/kv/kvserver/debug_print.go +++ b/pkg/kv/kvserver/debug_print.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // PrintEngineKeyValue attempts to print the given key-value pair to diff --git a/pkg/kv/kvserver/helpers_test.go b/pkg/kv/kvserver/helpers_test.go index 97e144e323f4..54f9c7b3a95e 100644 --- a/pkg/kv/kvserver/helpers_test.go +++ b/pkg/kv/kvserver/helpers_test.go @@ -46,7 +46,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) func (s *Store) Transport() *RaftTransport { diff --git a/pkg/kv/kvserver/kvserverpb/BUILD.bazel b/pkg/kv/kvserver/kvserverpb/BUILD.bazel index b81f22c6ad52..c7259fa8dc0a 100644 --- a/pkg/kv/kvserver/kvserverpb/BUILD.bazel +++ b/pkg/kv/kvserver/kvserverpb/BUILD.bazel @@ -43,7 +43,7 @@ proto_library( "@com_github_cockroachdb_errors//errorspb:errorspb_proto", "@com_github_gogo_protobuf//gogoproto:gogo_proto", "@com_google_protobuf//:timestamp_proto", - "@io_etcd_go_etcd_raft_v3//raftpb:raftpb_proto", + "@io_etcd_go_raft_v3//raftpb:raftpb_proto", ], ) @@ -64,7 +64,7 @@ go_proto_library( "//pkg/util/uuid", # keep "@com_github_cockroachdb_errors//errorspb", "@com_github_gogo_protobuf//gogoproto", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/kv/kvserver/kvserverpb/raft.proto b/pkg/kv/kvserver/kvserverpb/raft.proto index 0f8276cb13b1..4ec5d0288aed 100644 --- a/pkg/kv/kvserver/kvserverpb/raft.proto +++ b/pkg/kv/kvserver/kvserverpb/raft.proto @@ -18,7 +18,7 @@ import "roachpb/internal_raft.proto"; import "roachpb/metadata.proto"; import "kv/kvserver/liveness/livenesspb/liveness.proto"; import "kv/kvserver/kvserverpb/state.proto"; -import "etcd/raft/v3/raftpb/raft.proto"; +import "raft/v3/raftpb/raft.proto"; import "gogoproto/gogo.proto"; import "util/tracing/tracingpb/recorded_span.proto"; diff --git a/pkg/kv/kvserver/logstore/BUILD.bazel b/pkg/kv/kvserver/logstore/BUILD.bazel index 06ff749b07eb..8dfae5d3f6c0 100644 --- a/pkg/kv/kvserver/logstore/BUILD.bazel +++ b/pkg/kv/kvserver/logstore/BUILD.bazel @@ -32,8 +32,8 @@ go_library( "@com_github_cockroachdb_errors//:errors", "@com_github_cockroachdb_errors//oserror", "@com_github_cockroachdb_redact//:redact", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//raftpb", "@org_golang_x_time//rate", ], ) @@ -64,7 +64,7 @@ go_test( "@com_github_cockroachdb_errors//oserror", "@com_github_kr_pretty//:pretty", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", "@org_golang_x_time//rate", ], ) diff --git a/pkg/kv/kvserver/logstore/logstore.go b/pkg/kv/kvserver/logstore/logstore.go index 830cc6898980..47ab2f1abc6a 100644 --- a/pkg/kv/kvserver/logstore/logstore.go +++ b/pkg/kv/kvserver/logstore/logstore.go @@ -29,8 +29,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) var disableSyncRaftLog = settings.RegisterBoolSetting( diff --git a/pkg/kv/kvserver/logstore/logstore_bench_test.go b/pkg/kv/kvserver/logstore/logstore_bench_test.go index 85fb68f81c1c..2d4f8747e407 100644 --- a/pkg/kv/kvserver/logstore/logstore_bench_test.go +++ b/pkg/kv/kvserver/logstore/logstore_bench_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) type discardBatch struct { diff --git a/pkg/kv/kvserver/logstore/sideload.go b/pkg/kv/kvserver/logstore/sideload.go index 7bac58ba92a5..3fb2c1f908c3 100644 --- a/pkg/kv/kvserver/logstore/sideload.go +++ b/pkg/kv/kvserver/logstore/sideload.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) var errSideloadedFileNotFound = errors.New("sideloaded file not found") diff --git a/pkg/kv/kvserver/logstore/sideload_test.go b/pkg/kv/kvserver/logstore/sideload_test.go index f0d439462e1c..57869fec8404 100644 --- a/pkg/kv/kvserver/logstore/sideload_test.go +++ b/pkg/kv/kvserver/logstore/sideload_test.go @@ -38,7 +38,7 @@ import ( "github.com/cockroachdb/errors/oserror" "github.com/kr/pretty" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" "golang.org/x/time/rate" ) diff --git a/pkg/kv/kvserver/logstore/stateloader.go b/pkg/kv/kvserver/logstore/stateloader.go index 596c13832f59..3d05daaebae7 100644 --- a/pkg/kv/kvserver/logstore/stateloader.go +++ b/pkg/kv/kvserver/logstore/stateloader.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // StateLoader gives access to read or write the state of the Raft log. It diff --git a/pkg/kv/kvserver/loqrecovery/BUILD.bazel b/pkg/kv/kvserver/loqrecovery/BUILD.bazel index 76eb75c4592e..b9d7029b6b55 100644 --- a/pkg/kv/kvserver/loqrecovery/BUILD.bazel +++ b/pkg/kv/kvserver/loqrecovery/BUILD.bazel @@ -27,7 +27,7 @@ go_library( "//pkg/util/timeutil", "//pkg/util/uuid", "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) @@ -72,7 +72,7 @@ go_test( "@com_github_cockroachdb_errors//:errors", "@com_github_stretchr_testify//require", "@in_gopkg_yaml_v2//:yaml_v2", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/kv/kvserver/loqrecovery/collect.go b/pkg/kv/kvserver/loqrecovery/collect.go index fa1b387e2ee8..2c9154838c87 100644 --- a/pkg/kv/kvserver/loqrecovery/collect.go +++ b/pkg/kv/kvserver/loqrecovery/collect.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // CollectReplicaInfo captures states of all replicas in all stores for the sake of quorum recovery. diff --git a/pkg/kv/kvserver/loqrecovery/recovery_env_test.go b/pkg/kv/kvserver/loqrecovery/recovery_env_test.go index ab4dc2d5b5a1..665f15e8ab2a 100644 --- a/pkg/kv/kvserver/loqrecovery/recovery_env_test.go +++ b/pkg/kv/kvserver/loqrecovery/recovery_env_test.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" "gopkg.in/yaml.v2" ) diff --git a/pkg/kv/kvserver/metrics.go b/pkg/kv/kvserver/metrics.go index eabb5ccd811b..f93e90c6ce40 100644 --- a/pkg/kv/kvserver/metrics.go +++ b/pkg/kv/kvserver/metrics.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/pebble" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) var ( diff --git a/pkg/kv/kvserver/raft.go b/pkg/kv/kvserver/raft.go index ada66c2ebbad..807036d3087a 100644 --- a/pkg/kv/kvserver/raft.go +++ b/pkg/kv/kvserver/raft.go @@ -20,8 +20,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) // maxRaftMsgType is the maximum value in the raft.MessageType enum. diff --git a/pkg/kv/kvserver/raft_log_queue.go b/pkg/kv/kvserver/raft_log_queue.go index a0dc18bb1cb0..eb305fcae327 100644 --- a/pkg/kv/kvserver/raft_log_queue.go +++ b/pkg/kv/kvserver/raft_log_queue.go @@ -28,8 +28,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) // Overview of Raft log truncation: diff --git a/pkg/kv/kvserver/raft_log_queue_test.go b/pkg/kv/kvserver/raft_log_queue_test.go index 4cf10aaa981a..c4d9d0beb968 100644 --- a/pkg/kv/kvserver/raft_log_queue_test.go +++ b/pkg/kv/kvserver/raft_log_queue_test.go @@ -33,8 +33,8 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) func TestShouldTruncate(t *testing.T) { diff --git a/pkg/kv/kvserver/raft_snapshot_queue.go b/pkg/kv/kvserver/raft_snapshot_queue.go index 3921f340ec52..0ba36ab6c487 100644 --- a/pkg/kv/kvserver/raft_snapshot_queue.go +++ b/pkg/kv/kvserver/raft_snapshot_queue.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3/tracker" ) const ( diff --git a/pkg/kv/kvserver/raft_transport.go b/pkg/kv/kvserver/raft_transport.go index ab71cb548711..283643e551c1 100644 --- a/pkg/kv/kvserver/raft_transport.go +++ b/pkg/kv/kvserver/raft_transport.go @@ -32,7 +32,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" "google.golang.org/grpc" ) diff --git a/pkg/kv/kvserver/raft_transport_test.go b/pkg/kv/kvserver/raft_transport_test.go index fb3f0429d106..7cbb12d95177 100644 --- a/pkg/kv/kvserver/raft_transport_test.go +++ b/pkg/kv/kvserver/raft_transport_test.go @@ -38,7 +38,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) const channelServerBrokenRangeMessage = "channelServer broken range" diff --git a/pkg/kv/kvserver/raftentry/BUILD.bazel b/pkg/kv/kvserver/raftentry/BUILD.bazel index 5626c06b1aa5..2bb8df2a34a6 100644 --- a/pkg/kv/kvserver/raftentry/BUILD.bazel +++ b/pkg/kv/kvserver/raftentry/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//pkg/util/metric", "//pkg/util/syncutil", "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) @@ -33,7 +33,7 @@ go_test( "//pkg/roachpb", "//pkg/util/leaktest", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/kv/kvserver/raftentry/cache.go b/pkg/kv/kvserver/raftentry/cache.go index 1967794885e8..b3df6ada2af5 100644 --- a/pkg/kv/kvserver/raftentry/cache.go +++ b/pkg/kv/kvserver/raftentry/cache.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // Cache is a specialized data structure for storing deserialized raftpb.Entry diff --git a/pkg/kv/kvserver/raftentry/cache_test.go b/pkg/kv/kvserver/raftentry/cache_test.go index 6a99dde9376d..529395b2ab2d 100644 --- a/pkg/kv/kvserver/raftentry/cache_test.go +++ b/pkg/kv/kvserver/raftentry/cache_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) const noLimit = math.MaxUint64 diff --git a/pkg/kv/kvserver/raftentry/ring_buffer.go b/pkg/kv/kvserver/raftentry/ring_buffer.go index 834b97f63316..96f94d172d6e 100644 --- a/pkg/kv/kvserver/raftentry/ring_buffer.go +++ b/pkg/kv/kvserver/raftentry/ring_buffer.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // ringBuf is a ring buffer of raft entries. diff --git a/pkg/kv/kvserver/raftlog/BUILD.bazel b/pkg/kv/kvserver/raftlog/BUILD.bazel index 8ef4a9d612bd..d5453c06ae41 100644 --- a/pkg/kv/kvserver/raftlog/BUILD.bazel +++ b/pkg/kv/kvserver/raftlog/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "//pkg/util/iterutil", "//pkg/util/protoutil", "@com_github_cockroachdb_errors//:errors", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) @@ -48,7 +48,7 @@ go_test( "//pkg/util/protoutil", "//pkg/util/randutil", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/kv/kvserver/raftlog/command.go b/pkg/kv/kvserver/raftlog/command.go index 4ae40ff8e910..6e4acf31d575 100644 --- a/pkg/kv/kvserver/raftlog/command.go +++ b/pkg/kv/kvserver/raftlog/command.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverpb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // ReplicatedCmd is the part of kvserver.replicatedCmd relevant for stand-alone log diff --git a/pkg/kv/kvserver/raftlog/entry.go b/pkg/kv/kvserver/raftlog/entry.go index daa9d8a58089..ae96d1d75648 100644 --- a/pkg/kv/kvserver/raftlog/entry.go +++ b/pkg/kv/kvserver/raftlog/entry.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // Entry contains data related to a raft log entry. This is the raftpb.Entry diff --git a/pkg/kv/kvserver/raftlog/entry_test.go b/pkg/kv/kvserver/raftlog/entry_test.go index c95fdaaf8a6c..3fd947ada1e6 100644 --- a/pkg/kv/kvserver/raftlog/entry_test.go +++ b/pkg/kv/kvserver/raftlog/entry_test.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) func TestLoadInvalidEntry(t *testing.T) { diff --git a/pkg/kv/kvserver/raftlog/iter_bench_test.go b/pkg/kv/kvserver/raftlog/iter_bench_test.go index 06b0ac2ea26d..6d5cf9531e9a 100644 --- a/pkg/kv/kvserver/raftlog/iter_bench_test.go +++ b/pkg/kv/kvserver/raftlog/iter_bench_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) const rangeID = 1 diff --git a/pkg/kv/kvserver/raftlog/iter_test.go b/pkg/kv/kvserver/raftlog/iter_test.go index b9b067d763e1..f5deb5b13591 100644 --- a/pkg/kv/kvserver/raftlog/iter_test.go +++ b/pkg/kv/kvserver/raftlog/iter_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) func ents(inds ...uint64) []raftpb.Entry { diff --git a/pkg/kv/kvserver/raftlog/iterator.go b/pkg/kv/kvserver/raftlog/iterator.go index ed6dcaf8ca00..34ade5598649 100644 --- a/pkg/kv/kvserver/raftlog/iterator.go +++ b/pkg/kv/kvserver/raftlog/iterator.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/iterutil" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) type storageIter interface { diff --git a/pkg/kv/kvserver/raftutil/BUILD.bazel b/pkg/kv/kvserver/raftutil/BUILD.bazel index e75e215085da..a236cb6574eb 100644 --- a/pkg/kv/kvserver/raftutil/BUILD.bazel +++ b/pkg/kv/kvserver/raftutil/BUILD.bazel @@ -8,8 +8,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/roachpb", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//tracker", ], ) @@ -20,8 +20,8 @@ go_test( embed = [":raftutil"], deps = [ "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//tracker", ], ) diff --git a/pkg/kv/kvserver/raftutil/util.go b/pkg/kv/kvserver/raftutil/util.go index 029ae4d3e04e..54d26a984401 100644 --- a/pkg/kv/kvserver/raftutil/util.go +++ b/pkg/kv/kvserver/raftutil/util.go @@ -12,8 +12,8 @@ package raftutil import ( "github.com/cockroachdb/cockroach/pkg/roachpb" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) // ReplicaIsBehind returns whether the given peer replica is considered behind diff --git a/pkg/kv/kvserver/raftutil/util_test.go b/pkg/kv/kvserver/raftutil/util_test.go index 529d018f1336..1963306addfb 100644 --- a/pkg/kv/kvserver/raftutil/util_test.go +++ b/pkg/kv/kvserver/raftutil/util_test.go @@ -14,8 +14,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) func TestReplicaIsBehind(t *testing.T) { diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go index 93ebd3df7b31..090e7a19c32e 100644 --- a/pkg/kv/kvserver/replica.go +++ b/pkg/kv/kvserver/replica.go @@ -53,7 +53,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" "github.com/kr/pretty" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) const ( diff --git a/pkg/kv/kvserver/replica_application_decoder.go b/pkg/kv/kvserver/replica_application_decoder.go index 6a2e995693df..c4aeafc59a35 100644 --- a/pkg/kv/kvserver/replica_application_decoder.go +++ b/pkg/kv/kvserver/replica_application_decoder.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/quotapool" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // replica_application_*.go files provide concrete implementations of diff --git a/pkg/kv/kvserver/replica_application_state_machine.go b/pkg/kv/kvserver/replica_application_state_machine.go index b841b4af4f9e..c104a6282c9c 100644 --- a/pkg/kv/kvserver/replica_application_state_machine.go +++ b/pkg/kv/kvserver/replica_application_state_machine.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" "github.com/kr/pretty" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) // replica_application_*.go files provide concrete implementations of diff --git a/pkg/kv/kvserver/replica_application_state_machine_test.go b/pkg/kv/kvserver/replica_application_state_machine_test.go index 0f5a8f4a1d22..c0f78dd7210c 100644 --- a/pkg/kv/kvserver/replica_application_state_machine_test.go +++ b/pkg/kv/kvserver/replica_application_state_machine_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // TestReplicaStateMachineChangeReplicas tests the behavior of applying a diff --git a/pkg/kv/kvserver/replica_circuit_breaker.go b/pkg/kv/kvserver/replica_circuit_breaker.go index f71169e40eb3..22ade252ad7c 100644 --- a/pkg/kv/kvserver/replica_circuit_breaker.go +++ b/pkg/kv/kvserver/replica_circuit_breaker.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) type replicaInCircuitBreaker interface { diff --git a/pkg/kv/kvserver/replica_circuit_breaker_test.go b/pkg/kv/kvserver/replica_circuit_breaker_test.go index bcbe5d723f5d..e19037e7b213 100644 --- a/pkg/kv/kvserver/replica_circuit_breaker_test.go +++ b/pkg/kv/kvserver/replica_circuit_breaker_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) func TestReplicaUnavailableError(t *testing.T) { diff --git a/pkg/kv/kvserver/replica_command.go b/pkg/kv/kvserver/replica_command.go index 56e728cd24e4..4d78f82f54e2 100644 --- a/pkg/kv/kvserver/replica_command.go +++ b/pkg/kv/kvserver/replica_command.go @@ -46,9 +46,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" + "go.etcd.io/raft/v3/tracker" ) // mergeApplicationTimeout is the timeout when waiting for a merge command to be diff --git a/pkg/kv/kvserver/replica_gc_queue.go b/pkg/kv/kvserver/replica_gc_queue.go index 11d2dde22511..fa70f39ac7e0 100644 --- a/pkg/kv/kvserver/replica_gc_queue.go +++ b/pkg/kv/kvserver/replica_gc_queue.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) const ( diff --git a/pkg/kv/kvserver/replica_init.go b/pkg/kv/kvserver/replica_init.go index 89d0574c2c81..60b5e4ef6fa8 100644 --- a/pkg/kv/kvserver/replica_init.go +++ b/pkg/kv/kvserver/replica_init.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) const ( diff --git a/pkg/kv/kvserver/replica_metrics.go b/pkg/kv/kvserver/replica_metrics.go index 7b426b5e3f1e..71afe5303349 100644 --- a/pkg/kv/kvserver/replica_metrics.go +++ b/pkg/kv/kvserver/replica_metrics.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/liveness/livenesspb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) // ReplicaMetrics contains details on the current status of the replica. diff --git a/pkg/kv/kvserver/replica_proposal_buf.go b/pkg/kv/kvserver/replica_proposal_buf.go index 28fe399a6036..de57abf3085a 100644 --- a/pkg/kv/kvserver/replica_proposal_buf.go +++ b/pkg/kv/kvserver/replica_proposal_buf.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) // propBuf is a multi-producer, single-consumer buffer for Raft proposals on a diff --git a/pkg/kv/kvserver/replica_proposal_buf_test.go b/pkg/kv/kvserver/replica_proposal_buf_test.go index 77f5fa0b5980..8733d850a1ad 100644 --- a/pkg/kv/kvserver/replica_proposal_buf_test.go +++ b/pkg/kv/kvserver/replica_proposal_buf_test.go @@ -33,9 +33,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" - rafttracker "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" + rafttracker "go.etcd.io/raft/v3/tracker" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvserver/replica_proposal_quota.go b/pkg/kv/kvserver/replica_proposal_quota.go index 9f53bdb6ebcc..a284eab44b6e 100644 --- a/pkg/kv/kvserver/replica_proposal_quota.go +++ b/pkg/kv/kvserver/replica_proposal_quota.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/quotapool" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) func (r *Replica) maybeAcquireProposalQuota( diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go index 25ee5f8ad568..b0ae6f0082d7 100644 --- a/pkg/kv/kvserver/replica_raft.go +++ b/pkg/kv/kvserver/replica_raft.go @@ -41,9 +41,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" + "go.etcd.io/raft/v3/tracker" ) var ( diff --git a/pkg/kv/kvserver/replica_raft_overload.go b/pkg/kv/kvserver/replica_raft_overload.go index d10970a20d4a..c3b7cbf4d9ed 100644 --- a/pkg/kv/kvserver/replica_raft_overload.go +++ b/pkg/kv/kvserver/replica_raft_overload.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3/tracker" ) // pauseReplicationIOThreshold is the admission.io.overload threshold at which diff --git a/pkg/kv/kvserver/replica_raft_overload_test.go b/pkg/kv/kvserver/replica_raft_overload_test.go index ecaedd8fb283..6a31d3d0590f 100644 --- a/pkg/kv/kvserver/replica_raft_overload_test.go +++ b/pkg/kv/kvserver/replica_raft_overload_test.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/redact" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3/tracker" ) func TestReplicaRaftOverload_computeExpendableOverloadedFollowers(t *testing.T) { diff --git a/pkg/kv/kvserver/replica_raft_quiesce.go b/pkg/kv/kvserver/replica_raft_quiesce.go index 06414ebc9b53..31e022d2f6ff 100644 --- a/pkg/kv/kvserver/replica_raft_quiesce.go +++ b/pkg/kv/kvserver/replica_raft_quiesce.go @@ -20,8 +20,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) func (r *Replica) quiesceLocked(ctx context.Context, lagging laggingReplicaSet) { diff --git a/pkg/kv/kvserver/replica_raft_test.go b/pkg/kv/kvserver/replica_raft_test.go index 0c78ab7990e6..42306f01afc1 100644 --- a/pkg/kv/kvserver/replica_raft_test.go +++ b/pkg/kv/kvserver/replica_raft_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/redact" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3/tracker" ) func TestLastUpdateTimesMap(t *testing.T) { diff --git a/pkg/kv/kvserver/replica_raftstorage.go b/pkg/kv/kvserver/replica_raftstorage.go index 8625e269d690..00d53520413f 100644 --- a/pkg/kv/kvserver/replica_raftstorage.go +++ b/pkg/kv/kvserver/replica_raftstorage.go @@ -30,8 +30,8 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) // replicaRaftStorage implements the raft.Storage interface. diff --git a/pkg/kv/kvserver/replica_rangefeed_test.go b/pkg/kv/kvserver/replica_rangefeed_test.go index 6a35b5b1b66f..1a89ac7af89d 100644 --- a/pkg/kv/kvserver/replica_rangefeed_test.go +++ b/pkg/kv/kvserver/replica_rangefeed_test.go @@ -40,8 +40,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "google.golang.org/grpc/metadata" ) diff --git a/pkg/kv/kvserver/replica_rankings.go b/pkg/kv/kvserver/replica_rankings.go index 39986af6da0b..6ebebaac90cc 100644 --- a/pkg/kv/kvserver/replica_rankings.go +++ b/pkg/kv/kvserver/replica_rankings.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) const ( diff --git a/pkg/kv/kvserver/replica_test.go b/pkg/kv/kvserver/replica_test.go index 3d64fb8b74ef..cab3e00280dd 100644 --- a/pkg/kv/kvserver/replica_test.go +++ b/pkg/kv/kvserver/replica_test.go @@ -71,9 +71,9 @@ import ( "github.com/kr/pretty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" + "go.etcd.io/raft/v3/tracker" "golang.org/x/net/trace" ) diff --git a/pkg/kv/kvserver/replicate_queue.go b/pkg/kv/kvserver/replicate_queue.go index 5bdca9305eca..c5755ded92d7 100644 --- a/pkg/kv/kvserver/replicate_queue.go +++ b/pkg/kv/kvserver/replicate_queue.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/tracing/tracingpb" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) const ( diff --git a/pkg/kv/kvserver/replicate_queue_test.go b/pkg/kv/kvserver/replicate_queue_test.go index d231e97d9c94..e21d46ed01ef 100644 --- a/pkg/kv/kvserver/replicate_queue_test.go +++ b/pkg/kv/kvserver/replicate_queue_test.go @@ -51,7 +51,7 @@ import ( "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3/tracker" ) func TestReplicateQueueRebalance(t *testing.T) { diff --git a/pkg/kv/kvserver/split_delay_helper.go b/pkg/kv/kvserver/split_delay_helper.go index 5cf3c511eac9..0997fd6796d7 100644 --- a/pkg/kv/kvserver/split_delay_helper.go +++ b/pkg/kv/kvserver/split_delay_helper.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) type splitDelayHelperI interface { diff --git a/pkg/kv/kvserver/split_delay_helper_test.go b/pkg/kv/kvserver/split_delay_helper_test.go index f1764bcfd0e5..5dd74053cb93 100644 --- a/pkg/kv/kvserver/split_delay_helper_test.go +++ b/pkg/kv/kvserver/split_delay_helper_test.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) type testSplitDelayHelper struct { diff --git a/pkg/kv/kvserver/split_trigger_helper.go b/pkg/kv/kvserver/split_trigger_helper.go index 554e36a2048a..a9310ded8803 100644 --- a/pkg/kv/kvserver/split_trigger_helper.go +++ b/pkg/kv/kvserver/split_trigger_helper.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) const maxDelaySplitTriggerDur = 20 * time.Second diff --git a/pkg/kv/kvserver/split_trigger_helper_test.go b/pkg/kv/kvserver/split_trigger_helper_test.go index 90fb71cc6c8d..7ca2f51e8a4d 100644 --- a/pkg/kv/kvserver/split_trigger_helper_test.go +++ b/pkg/kv/kvserver/split_trigger_helper_test.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) type testMsgAppDropper struct { diff --git a/pkg/kv/kvserver/stateloader/BUILD.bazel b/pkg/kv/kvserver/stateloader/BUILD.bazel index e97a6959f5af..533574756750 100644 --- a/pkg/kv/kvserver/stateloader/BUILD.bazel +++ b/pkg/kv/kvserver/stateloader/BUILD.bazel @@ -34,7 +34,7 @@ go_test( "//pkg/testutils", "//pkg/util/leaktest", "//pkg/util/stop", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/kv/kvserver/stateloader/initial_test.go b/pkg/kv/kvserver/stateloader/initial_test.go index 955b819504ec..b940e98dcf71 100644 --- a/pkg/kv/kvserver/stateloader/initial_test.go +++ b/pkg/kv/kvserver/stateloader/initial_test.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) func TestSynthesizeHardState(t *testing.T) { diff --git a/pkg/kv/kvserver/store.go b/pkg/kv/kvserver/store.go index fb837065ffb6..8ecd3bc0dc29 100644 --- a/pkg/kv/kvserver/store.go +++ b/pkg/kv/kvserver/store.go @@ -89,7 +89,7 @@ import ( "github.com/cockroachdb/logtags" "github.com/cockroachdb/redact" prometheusgo "github.com/prometheus/client_model/go" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" "golang.org/x/time/rate" ) diff --git a/pkg/kv/kvserver/store_raft.go b/pkg/kv/kvserver/store_raft.go index bec4de617933..abe243e1af7b 100644 --- a/pkg/kv/kvserver/store_raft.go +++ b/pkg/kv/kvserver/store_raft.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) var ( diff --git a/pkg/kv/kvserver/store_raft_test.go b/pkg/kv/kvserver/store_raft_test.go index 9b84ac77d44a..f410b0506d54 100644 --- a/pkg/kv/kvserver/store_raft_test.go +++ b/pkg/kv/kvserver/store_raft_test.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) func TestRaftReceiveQueue(t *testing.T) { diff --git a/pkg/kv/kvserver/store_rebalancer.go b/pkg/kv/kvserver/store_rebalancer.go index 3f09dce83009..51b7d628fe41 100644 --- a/pkg/kv/kvserver/store_rebalancer.go +++ b/pkg/kv/kvserver/store_rebalancer.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) var ( diff --git a/pkg/kv/kvserver/store_rebalancer_test.go b/pkg/kv/kvserver/store_rebalancer_test.go index 200315eb36e9..e51cb22ad259 100644 --- a/pkg/kv/kvserver/store_rebalancer_test.go +++ b/pkg/kv/kvserver/store_rebalancer_test.go @@ -30,8 +30,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/tracker" ) var ( diff --git a/pkg/kv/kvserver/store_snapshot.go b/pkg/kv/kvserver/store_snapshot.go index 4533cf26212e..9e89167eded6 100644 --- a/pkg/kv/kvserver/store_snapshot.go +++ b/pkg/kv/kvserver/store_snapshot.go @@ -40,7 +40,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" "go.opentelemetry.io/otel/attribute" "golang.org/x/time/rate" "google.golang.org/grpc" diff --git a/pkg/kv/kvserver/store_split.go b/pkg/kv/kvserver/store_split.go index fe2637c19371..02a9ddd3c11e 100644 --- a/pkg/kv/kvserver/store_split.go +++ b/pkg/kv/kvserver/store_split.go @@ -21,8 +21,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" ) // splitPreApply is called when the raft command is applied. Any diff --git a/pkg/kv/kvserver/store_test.go b/pkg/kv/kvserver/store_test.go index 06c4c1d28d4d..4f7a4d8fe2d0 100644 --- a/pkg/kv/kvserver/store_test.go +++ b/pkg/kv/kvserver/store_test.go @@ -65,8 +65,8 @@ import ( "github.com/cockroachdb/errors" "github.com/kr/pretty" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/raftpb" "golang.org/x/sync/errgroup" "golang.org/x/time/rate" ) diff --git a/pkg/roachpb/BUILD.bazel b/pkg/roachpb/BUILD.bazel index 4958fc888cf7..60780120b23b 100644 --- a/pkg/roachpb/BUILD.bazel +++ b/pkg/roachpb/BUILD.bazel @@ -60,7 +60,7 @@ go_library( "@com_github_dustin_go_humanize//:go-humanize", "@com_github_gogo_protobuf//proto", "@com_github_golang_mock//gomock", # keep - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", "@org_golang_google_grpc//metadata", # keep ], ) @@ -117,11 +117,11 @@ go_test( "@com_github_kr_pretty//:pretty", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//:raft", - "@io_etcd_go_etcd_raft_v3//confchange", - "@io_etcd_go_etcd_raft_v3//quorum", - "@io_etcd_go_etcd_raft_v3//raftpb", - "@io_etcd_go_etcd_raft_v3//tracker", + "@io_etcd_go_raft_v3//:raft", + "@io_etcd_go_raft_v3//confchange", + "@io_etcd_go_raft_v3//quorum", + "@io_etcd_go_raft_v3//raftpb", + "@io_etcd_go_raft_v3//tracker", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//status", ], diff --git a/pkg/roachpb/data.go b/pkg/roachpb/data.go index d7ab235b6caf..ec8cd285a972 100644 --- a/pkg/roachpb/data.go +++ b/pkg/roachpb/data.go @@ -43,7 +43,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) const ( diff --git a/pkg/roachpb/data_test.go b/pkg/roachpb/data_test.go index ac8e1616b3e6..f879c6bdb7ca 100644 --- a/pkg/roachpb/data_test.go +++ b/pkg/roachpb/data_test.go @@ -39,7 +39,7 @@ import ( "github.com/cockroachdb/redact" "github.com/kr/pretty" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) func makeClockTS(walltime int64, logical int32) hlc.ClockTimestamp { diff --git a/pkg/roachpb/metadata_replicas.go b/pkg/roachpb/metadata_replicas.go index 4950adac01aa..f458ae8b7bf5 100644 --- a/pkg/roachpb/metadata_replicas.go +++ b/pkg/roachpb/metadata_replicas.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/redact" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // ReplicaSet is a set of replicas, usually the nodes/stores on which diff --git a/pkg/roachpb/metadata_replicas_test.go b/pkg/roachpb/metadata_replicas_test.go index 23e3a1fc86cf..c63d877e0a98 100644 --- a/pkg/roachpb/metadata_replicas_test.go +++ b/pkg/roachpb/metadata_replicas_test.go @@ -22,10 +22,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" - "go.etcd.io/etcd/raft/v3/confchange" - "go.etcd.io/etcd/raft/v3/quorum" - "go.etcd.io/etcd/raft/v3/tracker" + "go.etcd.io/raft/v3" + "go.etcd.io/raft/v3/confchange" + "go.etcd.io/raft/v3/quorum" + "go.etcd.io/raft/v3/tracker" ) func rd(typ ReplicaType, id uint64) ReplicaDescriptor { diff --git a/pkg/rpc/BUILD.bazel b/pkg/rpc/BUILD.bazel index 5418d5bbfe3f..5daa0b50acf0 100644 --- a/pkg/rpc/BUILD.bazel +++ b/pkg/rpc/BUILD.bazel @@ -121,7 +121,7 @@ go_test( "@com_github_cockroachdb_errors//:errors", "@com_github_cockroachdb_logtags//:logtags", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//credentials", diff --git a/pkg/rpc/codec_test.go b/pkg/rpc/codec_test.go index 34a9799858a8..3405b175c410 100644 --- a/pkg/rpc/codec_test.go +++ b/pkg/rpc/codec_test.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/server/BUILD.bazel b/pkg/server/BUILD.bazel index 7ddec56213b8..17984d9d6860 100644 --- a/pkg/server/BUILD.bazel +++ b/pkg/server/BUILD.bazel @@ -299,7 +299,7 @@ go_library( "@com_github_nightlyone_lockfile//:lockfile", "@com_github_nytimes_gziphandler//:gziphandler", "@in_gopkg_yaml_v2//:yaml_v2", - "@io_etcd_go_etcd_raft_v3//:raft", + "@io_etcd_go_raft_v3//:raft", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//metadata", diff --git a/pkg/server/serverpb/BUILD.bazel b/pkg/server/serverpb/BUILD.bazel index 5ee169721d7f..9a50a25685bc 100644 --- a/pkg/server/serverpb/BUILD.bazel +++ b/pkg/server/serverpb/BUILD.bazel @@ -42,7 +42,7 @@ proto_library( "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:timestamp_proto", "@go_googleapis//google/api:annotations_proto", - "@io_etcd_go_etcd_raft_v3//raftpb:raftpb_proto", + "@io_etcd_go_raft_v3//raftpb:raftpb_proto", ], ) @@ -85,7 +85,7 @@ go_proto_library( # NB: The grpc-gateway compiler injects a dependency on the descriptor # package that Gazelle isn't prepared to deal with. "@com_github_golang_protobuf//descriptor:go_default_library_gen", # keep - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ], ) diff --git a/pkg/server/serverpb/status.proto b/pkg/server/serverpb/status.proto index 17f49752bbee..fd94ef447cf3 100644 --- a/pkg/server/serverpb/status.proto +++ b/pkg/server/serverpb/status.proto @@ -36,7 +36,7 @@ import "util/log/logpb/log.proto"; import "util/unresolved_addr.proto"; import "util/tracing/tracingpb/tracing.proto"; -import "etcd/raft/v3/raftpb/raft.proto"; +import "raft/v3/raftpb/raft.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; @@ -349,7 +349,7 @@ message NodeRequest { } // RaftState gives internal details about a Raft group's state. -// Closely mirrors the upstream definitions in github.com/etcd-io/etcd/raft. +// Closely mirrors the upstream definitions in github.com/etcd-io/raft. message RaftState { message Progress { uint64 match = 1; diff --git a/pkg/server/status.go b/pkg/server/status.go index 6e982085196c..1610bc94adba 100644 --- a/pkg/server/status.go +++ b/pkg/server/status.go @@ -82,7 +82,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" - raft "go.etcd.io/etcd/raft/v3" + raft "go.etcd.io/raft/v3" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/pkg/storage/BUILD.bazel b/pkg/storage/BUILD.bazel index d4ff71159f06..14f49723a8ca 100644 --- a/pkg/storage/BUILD.bazel +++ b/pkg/storage/BUILD.bazel @@ -94,7 +94,7 @@ go_library( "@com_github_elastic_gosigar//:gosigar", "@com_github_gogo_protobuf//proto", "@com_github_prometheus_client_model//go", - "@io_etcd_go_etcd_raft_v3//raftpb", + "@io_etcd_go_raft_v3//raftpb", ], ) diff --git a/pkg/storage/replicas_storage.go b/pkg/storage/replicas_storage.go index 0c574e2a2b0b..17953e84cafc 100644 --- a/pkg/storage/replicas_storage.go +++ b/pkg/storage/replicas_storage.go @@ -12,7 +12,7 @@ package storage import ( "github.com/cockroachdb/cockroach/pkg/roachpb" - "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/raft/v3/raftpb" ) // TODO(sumeer): diff --git a/pkg/testutils/lint/passes/fmtsafe/functions.go b/pkg/testutils/lint/passes/fmtsafe/functions.go index 7d2e845c0c88..66c99188d6e6 100644 --- a/pkg/testutils/lint/passes/fmtsafe/functions.go +++ b/pkg/testutils/lint/passes/fmtsafe/functions.go @@ -109,12 +109,12 @@ var requireConstFmt = map[string]bool{ "(*github.com/cockroachdb/cockroach/pkg/kv/kvserver.raftLogger).Fatalf": true, "(*github.com/cockroachdb/cockroach/pkg/kv/kvserver.raftLogger).Panicf": true, - "(go.etcd.io/etcd/raft/v3.Logger).Debugf": true, - "(go.etcd.io/etcd/raft/v3.Logger).Infof": true, - "(go.etcd.io/etcd/raft/v3.Logger).Warningf": true, - "(go.etcd.io/etcd/raft/v3.Logger).Errorf": true, - "(go.etcd.io/etcd/raft/v3.Logger).Fatalf": true, - "(go.etcd.io/etcd/raft/v3.Logger).Panicf": true, + "(go.etcd.io/raft/v3.Logger).Debugf": true, + "(go.etcd.io/raft/v3.Logger).Infof": true, + "(go.etcd.io/raft/v3.Logger).Warningf": true, + "(go.etcd.io/raft/v3.Logger).Errorf": true, + "(go.etcd.io/raft/v3.Logger).Fatalf": true, + "(go.etcd.io/raft/v3.Logger).Panicf": true, "(google.golang.org/grpc/grpclog.Logger).Infof": true, "(google.golang.org/grpc/grpclog.Logger).Warningf": true, diff --git a/pkg/testutils/lint/passes/fmtsafe/testdata/src/a/a.go b/pkg/testutils/lint/passes/fmtsafe/testdata/src/a/a.go index e09b4e53a9f4..6685065397e7 100644 --- a/pkg/testutils/lint/passes/fmtsafe/testdata/src/a/a.go +++ b/pkg/testutils/lint/passes/fmtsafe/testdata/src/a/a.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/errors" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) var unsafeStr = "abc %d" diff --git a/pkg/testutils/lint/passes/fmtsafe/testdata/src/go.etcd.io/etcd/raft/v3/log.go b/pkg/testutils/lint/passes/fmtsafe/testdata/src/go.etcd.io/raft/v3/log.go similarity index 100% rename from pkg/testutils/lint/passes/fmtsafe/testdata/src/go.etcd.io/etcd/raft/v3/log.go rename to pkg/testutils/lint/passes/fmtsafe/testdata/src/go.etcd.io/raft/v3/log.go diff --git a/pkg/testutils/testcluster/BUILD.bazel b/pkg/testutils/testcluster/BUILD.bazel index 472a51893c76..9f005c946fba 100644 --- a/pkg/testutils/testcluster/BUILD.bazel +++ b/pkg/testutils/testcluster/BUILD.bazel @@ -34,7 +34,7 @@ go_library( "@com_github_cockroachdb_errors//:errors", "@com_github_cockroachdb_logtags//:logtags", "@com_github_stretchr_testify//require", - "@io_etcd_go_etcd_raft_v3//:raft", + "@io_etcd_go_raft_v3//:raft", ], ) diff --git a/pkg/testutils/testcluster/testcluster.go b/pkg/testutils/testcluster/testcluster.go index ec83285f48a6..58fb03b3e006 100644 --- a/pkg/testutils/testcluster/testcluster.go +++ b/pkg/testutils/testcluster/testcluster.go @@ -49,7 +49,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/raft/v3" + "go.etcd.io/raft/v3" ) // TestCluster represents a set of TestServers. The hope is that it can be used