Skip to content

[release/1.2 backport] bump google.golang.org/grpc v1.23.1#3995

Merged
dmcgowan merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_backport_bump_grpc
Jan 31, 2020
Merged

[release/1.2 backport] bump google.golang.org/grpc v1.23.1#3995
dmcgowan merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_backport_bump_grpc

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #3767

full diff: grpc/grpc-go@v1.23.0...v1.23.1

full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 885232b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

oh, looking at the diff, looks like only the second change is relevant (the deadlock is not in the vendored code).

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jan 31, 2020

Codecov Report

Merging #3995 into release/1.2 will increase coverage by 3.67%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3995      +/-   ##
===============================================
+ Coverage        44.19%   47.87%   +3.67%     
===============================================
  Files              100       91       -9     
  Lines            10847     8483    -2364     
===============================================
- Hits              4794     4061     -733     
+ Misses            5313     3688    -1625     
+ Partials           740      734       -6
Flag Coverage Δ
#linux 47.87% <ø> (ø) ⬆️
#windows ?
Impacted Files Coverage Δ
remotes/docker/auth.go 63.82% <0%> (-3.97%) ⬇️
remotes/docker/status.go 21.42% <0%> (-3.58%) ⬇️
platforms/cpuinfo.go 3.77% <0%> (-0.85%) ⬇️
log/context.go 36.84% <0%> (-0.66%) ⬇️
namespaces/context.go 55% <0%> (-0.56%) ⬇️
errdefs/grpc.go 74.6% <0%> (-0.4%) ⬇️
remotes/docker/pusher.go 0% <0%> (ø) ⬆️
content/local/locks.go 100% <0%> (ø) ⬆️
labels/validate.go 100% <0%> (ø) ⬆️
platforms/defaults.go 100% <0%> (ø) ⬆️
... and 57 more

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 a558638...520c8cb. Read the comment docs.

@dims
Copy link
Copy Markdown
Member

dims commented Jan 31, 2020

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
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 89c589b into containerd:release/1.2 Jan 31, 2020
@thaJeztah thaJeztah deleted the 1.2_backport_bump_grpc branch February 1, 2020 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants