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

Jump to bottom

Upgrade to google.golang.org/grpc@1.35.0 #12636

Closed
wants to merge 27 commits into from
Closed

Upgrade to google.golang.org/grpc@1.35.0 #12636

wants to merge 27 commits into from

Commits on Jan 20, 2021

  1. (Temporarily) removing indirect dependencies in go mod. 

    This is intended so that `go mod tidy` can be used to re-generate
imports (to prepare for an update of `google.golang.org/grpc`.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    f790eee View commit details
    Browse the repository at this point in the history

  2. Directly vendoring in grpc/naming types to drop the dependency. 

    The official recommendation is to move to
`google.golang.org/grpc/resolver` but this is not exactly a drop-in
replacement.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    5cfaeaf View commit details
    Browse the repository at this point in the history

  3. Using vendored client/v3/grpcnaming.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    061f660 View commit details
    Browse the repository at this point in the history

  4. Updating to google.golang.org/grpc@1.35.0 in all go.mod files. 

    This is because the `grpc/naming` breaking change happened in
`v1.30.0` (i.e. we need to get past `v1.29.1`).

See: https://github.com/grpc/grpc-go/releases/tag/v1.30.0
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    eb1cc38 View commit details
    Browse the repository at this point in the history

  5. Updating interfaces in client/v3/balancer/picker. 

    The two implementations updated satisfy
`(google.golang.org/grpc/balancer).Picker`, see the history of this
interface:

- https://pkg.go.dev/google.golang.org/grpc@v1.29.1/balancer#Picker
- https://pkg.go.dev/google.golang.org/grpc@v1.30.0/balancer#Picker
- https://pkg.go.dev/google.golang.org/grpc@v1.35.0/balancer#Picker
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    2780f25 View commit details
    Browse the repository at this point in the history

  6. Updating interfaces in client/v3/balancer. 

    The `baseBalancer` struct satisfies
`(google.golang.org/grpc/balancer).Balancer`, see the history of this
interface:

- https://pkg.go.dev/google.golang.org/grpc@v1.29.1/balancer#Balancer
- https://pkg.go.dev/google.golang.org/grpc@v1.30.0/balancer#Balancer
- https://pkg.go.dev/google.golang.org/grpc@v1.35.0/balancer#Balancer
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    4ef628f View commit details
    Browse the repository at this point in the history

  7. Re-ran go mod tidy in api/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    c1b82bb View commit details
    Browse the repository at this point in the history

  8. Re-ran go mod tidy in pkg/. 

    See etcd-io#12564 (comment)
for how I determined which order to visit packages in.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    9f63964 View commit details
    Browse the repository at this point in the history

  9. Re-ran go mod tidy in tools/mod/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    1141d4c View commit details
    Browse the repository at this point in the history

  10. Re-ran go mod tidy in client/v2/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    79b2c3a View commit details
    Browse the repository at this point in the history

  11. Re-ran go mod tidy in client/v3/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    04eb8b6 View commit details
    Browse the repository at this point in the history

  12. Re-ran go mod tidy in raft/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    e51f86c View commit details
    Browse the repository at this point in the history

  13. Re-ran go mod tidy in server/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    91b12f9 View commit details
    Browse the repository at this point in the history

  14. Re-ran go mod tidy in etcdctl/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    41d0e29 View commit details
    Browse the repository at this point in the history

  15. Re-ran go mod tidy in tests/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    d4c917e View commit details
    Browse the repository at this point in the history

  16. Re-ran go mod tidy in root package.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    4a5ad64 View commit details
    Browse the repository at this point in the history

  17. Updating genproto dependency in api. 

    This is to address CI failure

```
FAIL: inconsistent versions for depencency: google.golang.org/genproto
  - google.golang.org/genproto@v0.0.0-20200526211855-cb27e3aa2013 from: go.etcd.io/etcd/api/v3
  - google.golang.org/genproto@v0.0.0-20200806141610-86f49bd18e98 from: go.etcd.io/etcd/server/v3
FAIL: inconsistent dependencies
FAIL: 'dep' failed at Wed Jan 20 21:00:57 UTC 2021
```
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    284058b View commit details
    Browse the repository at this point in the history

  18. Rolling back to google.golang.org/grpc@1.30.0 and `github.com/golan… 

    …g/protobuf@v1.3.3`.

Done via:

```
git grep -l 'google.golang.org/grpc v1.35.0' -- '*go.mod' | xargs sed -i '' s/'google.golang.org\/grpc v1.35.0'/'google.golang.org\/grpc v1.30.0'/g
git grep -l 'github.com/golang/protobuf v1.4.2' -- '*go.mod' | xargs sed -i '' s/'github.com\/golang\/protobuf v1.4.2'/'github.com\/golang\/protobuf v1.3.3'/g
```
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    1b59112 View commit details
    Browse the repository at this point in the history

  19. Re-ran go mod tidy in api/. 

    This included a `replace` directive for the `protobuf` version.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    f8e52c7 View commit details
    Browse the repository at this point in the history

  20. Re-ran go mod tidy in pkg/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    5e45a43 View commit details
    Browse the repository at this point in the history

  21. Re-ran go mod tidy in client/v2/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    9dbf34c View commit details
    Browse the repository at this point in the history

  22. Re-ran go mod tidy in client/v3/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    6b44f15 View commit details
    Browse the repository at this point in the history

  23. Re-ran go mod tidy in raft/.

    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    8220f16 View commit details
    Browse the repository at this point in the history

  24. Re-ran go mod tidy in server/. 

    This included a `replace` directive for the `protobuf` version.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    60174e7 View commit details
    Browse the repository at this point in the history

  25. Re-ran go mod tidy in etcdctl/. 

    This included a `replace` directive for the `grpc` version.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    7d63cb6 View commit details
    Browse the repository at this point in the history

  26. Re-ran go mod tidy in tests/. 

    This included a `replace` directive for the `grpc` and `protobuf`
versions.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    7607937 View commit details
    Browse the repository at this point in the history

  27. Re-ran go mod tidy in root directory. 

    This included a `replace` directive for the `grpc` version.
    Danny Hermes committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    b7f8d58 View commit details
    Browse the repository at this point in the history