Skip to content

Commit

Permalink
Merge #56233
Browse files Browse the repository at this point in the history 
56233: *: upgrade etcd/raft to master r=knz a=tbg

We were using a custom fork that we picked up during our vgo transition,
but in the meantime upstream has turned `raft` into a small module which
has very few deps, and which we can switch back to.

Helpfully, this module already pins gogoproto v1.3+, which simplifies
PR #56147.

I did review the commits we're picking up here in etcd/raft and they look good. The ones worth pointing out are:

etcd-io/etcd#12137
etcd-io/etcd#12134
etcd-io/etcd#12163

These all seem to fix real bugs.

Release note: None


Co-authored-by: Tobias Grieger <[email protected]>
  • Loading branch information
@tbg
craig[bot] and tbg committed Nov 13, 2020
2 parents e7a5761 + 6e4c3ae commit 06a70e0
Show file tree
Hide file tree
Showing 88 changed files with 832 additions and 764 deletions.
89 changes: 76 additions & 13 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ def go_deps():
name = "co_honnef_go_tools",
build_file_proto_mode = "disable_global",
importpath = "honnef.co/go/tools",
sum = "h1:RFEMAhc9/Ej5KcaFZooS1PGYAhVl+CUxVj2gyKYGxKQ=",
version = "v0.0.0-20190530104931-1f0868a609b7",
sum = "h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=",
version = "v0.0.1-2019.2.3",
)
go_repository(
name = "com_github_abourget_teamcity",
Expand Down Expand Up @@ -541,6 +541,14 @@ def go_deps():
sum = "h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=",
version = "v0.0.0-20190719114852-fd7a80b32e1f",
)
go_repository(
name = "com_github_coreos_go_systemd_v22",
build_file_proto_mode = "disable",
importpath = "github.com/coreos/go-systemd/v22",
sum = "h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg=",
version = "v22.1.0",
)

go_repository(
name = "com_github_coreos_pkg",
build_file_proto_mode = "disable_global",
Expand All @@ -559,8 +567,8 @@ def go_deps():
name = "com_github_creack_pty",
build_file_proto_mode = "disable_global",
importpath = "github.com/creack/pty",
sum = "h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=",
version = "v1.1.9",
sum = "h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=",
version = "v1.1.11",
)
go_repository(
name = "com_github_data_dog_go_sqlmock",
Expand Down Expand Up @@ -940,6 +948,14 @@ def go_deps():
sum = "h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=",
version = "v1.0.2",
)
go_repository(
name = "com_github_godbus_dbus_v5",
build_file_proto_mode = "disable",
importpath = "github.com/godbus/dbus/v5",
sum = "h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=",
version = "v5.0.3",
)

go_repository(
name = "com_github_gofrs_uuid",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -1116,6 +1132,14 @@ def go_deps():
sum = "h1:beB+Da4k9B1zmgag78k3k1Bx4L/fdWr5FwNa0f8RxmY=",
version = "v0.0.0-20190109223431-e84dfd68c163",
)
go_repository(
name = "com_github_google_renameio",
build_file_proto_mode = "disable",
importpath = "github.com/google/renameio",
sum = "h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=",
version = "v0.1.0",
)

go_repository(
name = "com_github_google_uuid",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -2218,6 +2242,14 @@ def go_deps():
sum = "h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=",
version = "v1.2.0",
)
go_repository(
name = "com_github_rogpeppe_go_internal",
build_file_proto_mode = "disable",
importpath = "github.com/rogpeppe/go-internal",
sum = "h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=",
version = "v1.3.0",
)

go_repository(
name = "com_github_rs_xid",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -2659,6 +2691,14 @@ def go_deps():
sum = "h1:Ev7yu1/f6+d+b3pi5vPdRPc6nNtP1umSfcWiEfRqv6I=",
version = "v1.0.25",
)
go_repository(
name = "in_gopkg_errgo_v2",
build_file_proto_mode = "disable",
importpath = "gopkg.in/errgo.v2",
sum = "h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=",
version = "v2.1.0",
)

go_repository(
name = "in_gopkg_fsnotify_v1",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -2776,10 +2816,25 @@ def go_deps():
name = "io_etcd_go_etcd",
build_file_proto_mode = "disable_global",
importpath = "go.etcd.io/etcd",
replace = "github.com/cockroachdb/etcd",
sum = "h1:1ELogBFqZl2Cj/Rn0wWAU4z2/ghBlHzhXDlbT8RlrKU=",
version = "v0.4.7-0.20200615211340-a17df30d5955",
sum = "h1:V1RzkZJj9LqsJRy+TUBgpWSbZXITLB819lstuTFoZOY=",
version = "v3.3.25+incompatible",
)
go_repository(
name = "io_etcd_go_etcd_pkg_v3",
build_file_proto_mode = "disable",
importpath = "go.etcd.io/etcd/pkg/v3",
replace = "go.etcd.io/etcd/pkg/v3",
sum = "h1:U/PIBuOTa8JXLPKF81Xh7xhIjA0jbpyqFWUPIiT4Ilc=",
version = "v3.0.0-20201109164711-01844fd28560",
)
go_repository(
name = "io_etcd_go_etcd_raft_v3",
build_file_proto_mode = "disable",
importpath = "go.etcd.io/etcd/raft/v3",
sum = "h1:+9CYw4wP53Ryj4CtTy4VJv1fzA6SgyVZkCUEubdsISg=",
version = "v3.0.0-20201109164711-01844fd28560",
)

go_repository(
name = "io_k8s_sigs_yaml",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -2960,22 +3015,30 @@ def go_deps():
name = "org_uber_go_atomic",
build_file_proto_mode = "disable_global",
importpath = "go.uber.org/atomic",
sum = "h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=",
version = "v1.4.0",
sum = "h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=",
version = "v1.6.0",
)
go_repository(
name = "org_uber_go_multierr",
build_file_proto_mode = "disable_global",
importpath = "go.uber.org/multierr",
sum = "h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=",
version = "v1.1.0",
sum = "h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=",
version = "v1.5.0",
)
go_repository(
name = "org_uber_go_tools",
build_file_proto_mode = "disable",
importpath = "go.uber.org/tools",
sum = "h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=",
version = "v0.0.0-20190618225709-2cfd321de3ee",
)

go_repository(
name = "org_uber_go_zap",
build_file_proto_mode = "disable_global",
importpath = "go.uber.org/zap",
sum = "h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=",
version = "v1.10.0",
sum = "h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=",
version = "v1.16.0",
)
go_repository(
name = "tools_gotest",
Expand Down
13 changes: 9 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ require (
github.com/twpayne/go-geom v1.3.6
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
github.com/zabawaba99/go-gitignore v0.0.0-20200117185801-39e6bddfb292
go.etcd.io/etcd v0.0.0-00010101000000-000000000000
go.etcd.io/etcd/raft/v3 v3.0.0-20201109164711-01844fd28560
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/exp v0.0.0-20201008143054-e3b2a7f2fdc7
golang.org/x/lint v0.0.0-20200130185559-910be7a94367
Expand All @@ -166,7 +166,7 @@ require (
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v2 v2.3.0
gotest.tools v2.2.0+incompatible // indirect
honnef.co/go/tools v0.0.0-20190530104931-1f0868a609b7
honnef.co/go/tools v0.0.1-2019.2.3
vitess.io/vitess v0.0.0-00010101000000-000000000000
)

Expand All @@ -182,6 +182,11 @@ replace vitess.io/vitess => github.com/cockroachdb/vitess v2.2.0-rc.1.0.20180830

replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20180705215940-0e2822948641

replace go.etcd.io/etcd => github.com/cockroachdb/etcd v0.4.7-0.20200615211340-a17df30d5955

replace github.com/knz/go-libedit => github.com/otan-cockroach/go-libedit v1.10.2-0.20201030151939-7cced08450e7

// At the time of writing (i.e. as of this version below) the `etcd` repo is in the process of properly introducing
// modules, and as part of that uses an unsatisfiable version for this dependency (v3.0.0-00010101000000-000000000000).
// We just force it to the same SHA as the `go.etcd.io/etcd/raft/v3` module (they live in the same VCS root).
//
// While this is necessary, make sure that the require block above does not diverge.
replace go.etcd.io/etcd/pkg/v3 => go.etcd.io/etcd/pkg/v3 v3.0.0-20201109164711-01844fd28560
Loading

0 comments on commit 06a70e0

Please sign in to comment.