Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go.mod: import etcd/raft at the new path #93190

Merged
merged 1 commit into from
Dec 19, 2022
Merged

go.mod: import etcd/raft at the new path #93190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions DEPS.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/http/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions docs/generated/http/full.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
| ----- | ---- | ----- | ----------- | -------------- |
Expand Down Expand Up @@ -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 |
| ----- | ---- | ----- | ----------- | -------------- |
Expand Down Expand Up @@ -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 |
| ----- | ---- | ----- | ----------- | -------------- |
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/debug_check_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/mirror/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/protoc-gen-gogoroach/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/protoc-gen-gogoroach/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 7 additions & 7 deletions pkg/kv/kvserver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/allocator/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/kv/kvserver/allocator/allocatorimpl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down Expand Up @@ -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",
],
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/allocator/allocatorimpl/allocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/allocator/allocatorimpl/allocator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/allocator/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/allocator_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/apply/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand All @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/apply/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/apply/task_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/asim/state/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/asim/state/impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/asim/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/asim/storerebalancer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/asim/storerebalancer/candidate_replica.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/below_raft_protos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/client_atomic_membership_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading