Update grpc to v1.3.0 and bump protobuf bindings.#2229
Merged
aaronlehmann merged 1 commit intomoby:masterfrom Jun 9, 2017
Merged
Update grpc to v1.3.0 and bump protobuf bindings.#2229aaronlehmann merged 1 commit intomoby:masterfrom
aaronlehmann merged 1 commit intomoby:masterfrom
Conversation
|
Please sign your commits following these rules: $ git clone -b "bump-grpc" git@github.com:ijc25/swarmkit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354014976
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
Contributor
Author
|
Gordon is upset because I forgot the S-o-b when I merged in #2224 and friends, that will go away as they are merged and I rebase. |
ijc
pushed a commit
to ijc/moby
that referenced
this pull request
Jun 8, 2017
and update some dependent packages. We would like to keep moby/moby and swarmkit somewhat in sync here and moby/swarmkit#2229 proposes a similar bump to swarmkit, needed due to moby/swarmkit#1965 which pulls in containerd which uses some newer features of the grpc package. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Codecov Report
@@ Coverage Diff @@
## master #2229 +/- ##
=========================================
+ Coverage 60.16% 60.7% +0.54%
=========================================
Files 124 124
Lines 20156 20156
=========================================
+ Hits 12126 12236 +110
+ Misses 6669 6550 -119
- Partials 1361 1370 +9 |
Contributor
Author
|
FYI I have raised a similar PR against Moby engine in moby/moby#33590. Probably some discussion is needed around sequencing. |
Collaborator
|
The actual changes here look good. Once the dependencies are merged and this is rebased, I think it can go in, assuming CI for the moby PR is passing at that point. I don't think there are any significant sequencing issues since there aren't major code changes that need to take place in either repository. If we have a moby change ready to go in, we can merge this one first and then coordinate the moby change with the revendoring. |
Add google.golang.org/genproto to resolve:
vendor/google.golang.org/grpc/status/status.go:49:2: cannot find package "google.golang.org/genproto/googleapis/rpc/status" in any of:
Update golang.org/x/net to resolve:
vendor/google.golang.org/grpc/transport/http_util.go:417: f.fr.SetReuseFrames undefined (type *http2.Framer has no field or method SetReuseFrames)
Newer version of grpc uses the error code names (InvalidArgument,
PermissionDenied) instead of the numbers (e.g. 3, 7 respectively), which
requires updates to the expected error strings in some test cases.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Contributor
Author
|
Prereqs are in so rebased and edited description/title. |
Contributor
Author
|
@aaronlehmann you CI rerun on moby/moby#33590 passed, but I see this has now failed. Integration tests failed with: which was also seen in #2222. |
Collaborator
|
I really suspect #2222 did something to make this failure more common. I don't recall seeing it before.
|
Collaborator
|
LGTM |
alyyousuf7
added a commit
to alyyousuf7/swarmkit
that referenced
this pull request
Jun 22, 2017
Signed-off-by: Ali Yousuf <aly.yousuf7@gmail.com>
alyyousuf7
added a commit
to alyyousuf7/swarmkit
that referenced
this pull request
Jun 22, 2017
Signed-off-by: Ali Yousuf <aly.yousuf7@gmail.com>
alyyousuf7
added a commit
to alyyousuf7/swarmkit
that referenced
this pull request
Jun 22, 2017
Signed-off-by: Ali Yousuf <aly.yousuf7@gmail.com>
andrewhsu
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Jun 24, 2017
and update some dependent packages. We would like to keep moby/moby and swarmkit somewhat in sync here and moby/swarmkit#2229 proposes a similar bump to swarmkit, needed due to moby/swarmkit#1965 which pulls in containerd which uses some newer features of the grpc package. Signed-off-by: Ian Campbell <ian.campbell@docker.com> Upstream-commit: 379557a Component: engine
silvin-lubecki
pushed a commit
to silvin-lubecki/engine-extract
that referenced
this pull request
Mar 16, 2020
and update some dependent packages. We would like to keep moby/moby and swarmkit somewhat in sync here and moby/swarmkit#2229 proposes a similar bump to swarmkit, needed due to moby/swarmkit#1965 which pulls in containerd which uses some newer features of the grpc package. Signed-off-by: Ian Campbell <ian.campbell@docker.com> Upstream-commit: 379557a Component: engine
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add google.golang.org/genproto to resolve:
Update golang.org/x/net to resolve:
Newer version of grpc uses the error code names (
InvalidArgument,PermissionDenied) instead of the numbers (e.g.3,7respectively), which requires updates to the expected error strings in some test cases.Signed-off-by: Ian Campbell ian.campbell@docker.com