Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 6, 2019

Bumping in two steps, so that I can cherry-pick the first one into the 1.2 release (assuming we don't want to bump too many versions in that branch);

bump google.golang.org/grpc v1.12.2

full diff: grpc/grpc-go@v1.12.0...v1.12.2

bump google.golang.org/grpc v1.20.1

full diff: grpc/grpc-go@v1.12.2...v1.20.1

includes grpc/grpc-go#2695 transport: do not close channel that can lead to panic

@thaJeztah
Copy link
Member Author

@AkihiroSuda PTAL #3186 (comment)

@thaJeztah thaJeztah mentioned this pull request Apr 6, 2019
@thaJeztah
Copy link
Member Author

Ah, let me update;

client.go:105:4:warning: grpc.WithDialer is deprecated: use WithContextDialer instead  (SA1019) (staticcheck)
98client.go:228:79:warning: grpc.FailFast is deprecated: use WaitForReady.  (SA1019) (staticcheck)
99cmd\containerd\command\publish.go:98:3:warning: grpc.WithDialer is deprecated: use WithContextDialer instead  (SA1019) (staticcheck)
100services\server\server.go:374:3:warning: grpc.WithDialer is deprecated: use WithContextDialer instead  (SA1019) (staticcheck)

@codecov-io
Copy link

codecov-io commented Apr 6, 2019

Codecov Report

Merging #3192 into master will increase coverage by 0.28%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3192      +/-   ##
==========================================
+ Coverage   44.66%   44.95%   +0.28%     
==========================================
  Files         113      113              
  Lines       12156    12233      +77     
==========================================
+ Hits         5430     5499      +69     
+ Misses       5893     5891       -2     
- Partials      833      843      +10
Flag Coverage Δ
#linux 48.68% <0%> (ø) ⬆️
#windows 39.8% <0%> (-0.1%) ⬇️
Impacted Files Coverage Δ
services/server/server.go 1.26% <0%> (ø) ⬆️
remotes/docker/resolver.go 66.96% <0%> (+6.81%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d71c7ad...2ed8e60. Read the comment docs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we support ctx.Cancel?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My current approach is a bit dirty yeah; I'm not too familiar with these, so better suggestions are definitely welcome (was also thinking of reversing the logic and use context as the default)

If you can show a quick example, I'm happy to add it 😅

@thaJeztah thaJeztah changed the title bump google.golang.org/grpc v1.19.1 bump google.golang.org/grpc v1.20.0 Apr 11, 2019
@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 11, 2019

updated to v1.20 to include includes grpc/grpc-go#2695 transport: do not close channel that can lead to panic (also see moby/moby#39053)

@thaJeztah
Copy link
Member Author

@AkihiroSuda @dmcgowan @tonistiigi PTAL

@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 12, 2019

Don't think failure is related, but I'll re-push to trigger CI;

    --- FAIL: TestContentClient/CommitErrorState (4.61s)
1324        testsuite.go:117: Cleanup failed: unknown
1325            github.com/containerd/containerd/errdefs.init.ializers
1326            	C:/gopath/src/github.com/containerd/containerd/errdefs/errors.go:39
1327            runtime.main
1328            	C:/go/src/runtime/proc.go:188
1329            runtime.goexit
1330            	C:/go/src/runtime/asm_amd64.s:1337
1331            remove C:\Program Files\containerd\root-test\io.containerd.content.v1.content\ingest\9101c5f249b4cb38a50dddda86a787c09f31099573c87c525fc50774ac21d05d\.tmp-updatedat224900915: The process cannot access the file because it is being used by another process.
1332            github.com/containerd/containerd/errdefs.FromGRPC
1333            	C:/gopath/src/github.com/containerd/containerd/errdefs/grpc.go:98
1334            github.com/containerd/containerd/content/proxy.(*proxyContentStore).Abort
1335            	C:/gopath/src/github.com/containerd/containerd/content/proxy/content_store.go:187
1336            github.com/containerd/containerd.newContentStore.func2
1337            	C:/gopath/src/github.com/containerd/containerd/content_test.go:60
1338            github.com/containerd/containerd/content/testsuite.makeTest.func1.1
1339            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:116
1340            github.com/containerd/containerd/content/testsuite.makeTest.func1
1341            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:137
1342            testing.tRunner
1343            	C:/go/src/testing/testing.go:865
1344            runtime.goexit
1345            	C:/go/src/runtime/asm_amd64.s:1337
1346            failed to abort c1-commiterror-state
1347            github.com/containerd/containerd.newContentStore.func2
1348            	C:/gopath/src/github.com/containerd/containerd/content_test.go:61
1349            github.com/containerd/containerd/content/testsuite.makeTest.func1.1
1350            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:116
1351            github.com/containerd/containerd/content/testsuite.makeTest.func1
1352            	C:/gopath/src/github.com/containerd/containerd/content/testsuite/testsuite.go:137
1353            testing.tRunner
1354            	C:/go/src/testing/testing.go:865
1355            runtime.goexit
1356            	C:/go/src/runtime/asm_amd64.s:1337
1357=== RUN   TestOCIExport
1358--- SKIP: TestOCIExport (0.00s)
1359

@AkihiroSuda
Copy link
Member

Seems to break BuildKit, though it might not be problematic for containerd per se: moby/buildkit#936

thaJeztah added 2 commits May 5, 2019 12:38
full diff: grpc/grpc-go@v1.12.0...v1.12.2

- grpc/grpc-go#2074 transport/server: fix race between writing status and header
  - fix grpc/grpc-go#1972 Possible race sending headers from server while receiving message over size limit
- grpc/grpc-go#2074 transport: account for user configured small io write buffer
  - fix grpc/grpc-go#2089 Server abruptly terminates connections if write buffer is small enough

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the bump_grpc_1.19.1 branch from e37ef00 to 2ed8e60 Compare May 5, 2019 19:39
@thaJeztah thaJeztah changed the title bump google.golang.org/grpc v1.20.0 bump google.golang.org/grpc v1.20.1 May 5, 2019
@fuweid
Copy link
Member

fuweid commented May 7, 2019

I think the failed case is flaky one. @thaJeztah could you repush it again?

@fuweid
Copy link
Member

fuweid commented May 7, 2019

ping @AkihiroSuda is it the same issue to the buildkitd one?

@crosbymichael
Copy link
Member

LGTM

Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dmcgowan dmcgowan merged commit 25daa73 into containerd:master May 22, 2019
@thaJeztah thaJeztah deleted the bump_grpc_1.19.1 branch May 22, 2019 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants