Skip to content

Update grpc to 1.12#2369

Merged
crosbymichael merged 2 commits intocontainerd:masterfrom
dmcgowan:update-grpc
May 30, 2018
Merged

Update grpc to 1.12#2369
crosbymichael merged 2 commits intocontainerd:masterfrom
dmcgowan:update-grpc

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented May 29, 2018

Keeps GRPC up to date and needed to reconcile to an issue with GRPC 1.10 while vendoring into moby. I don't think we should consider backport this to 1.1 unless someone has a compelling reason though.

@dmcgowan
Update grpc to 1.12
d2fc059 
Signed-off-by: Derek McGowan <[email protected]>
@mlaventure
Copy link
Copy Markdown
Contributor

mlaventure commented May 29, 2018 

client.go:92:4:warning: grpc.WithTimeout is deprecated: use DialContext and context.WithTimeout instead.  (SA1019) (staticcheck)
client_test.go:54:2:warning: grpclog.SetLogger is deprecated: use SetLoggerV2.  (SA1019) (staticcheck)
cmd/containerd/command/main.go:53:2:warning: grpclog.SetLogger is deprecated: use SetLoggerV2.  (SA1019) (staticcheck)
cmd/containerd/command/publish.go:98:3:warning: grpc.WithTimeout is deprecated: use DialContext and context.WithTimeout instead.  (SA1019) (staticcheck)
cmd/ctr/app/main.go:47:2:warning: grpclog.SetLogger is deprecated: use SetLoggerV2.  (SA1019) (staticcheck)

@dmcgowan
Copy link
Copy Markdown
Member Author

dmcgowan commented May 29, 2018

Updating the static checks now. It does look like GRPC has made some logging improvements we can take advantage of. I will just update to continue discarding but add a follow up which can get the logs nicely into logrus.

@mlaventure
Copy link
Copy Markdown
Contributor

mlaventure commented May 29, 2018

Missing the DCO on the last commit 😅

@dmcgowan
Update grpc timeout and logger
55afe33 
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan
Copy link
Copy Markdown
Member Author

dmcgowan commented May 29, 2018

Oh man, I better delete your comment before people see that 😆

@codecov-io
Copy link
Copy Markdown

codecov-io commented May 29, 2018

Codecov Report

Merging #2369 into master will increase coverage by 3.7%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #2369     +/-   ##
=========================================
+ Coverage    41.4%   45.11%   +3.7%     
=========================================
  Files          66       92     +26     
  Lines        7805     9358   +1553     
=========================================
+ Hits         3232     4222    +990     
- Misses       4069     4457    +388     
- Partials      504      679    +175
Flag Coverage Δ
#linux 49.34% <ø> (?)
#windows 41.4% <ø> (ø) ⬆️
Impacted Files Coverage Δ
snapshots/overlay/overlay.go 52.52% <0%> (ø)
mount/mountinfo_linux.go 53.06% <0%> (ø)
mount/temp.go 14.28% <0%> (ø)
oci/spec_unix.go 98.37% <0%> (ø)
mount/temp_unix.go 0% <0%> (ø)
mount/lookup_unix.go 0% <0%> (ø)
sys/epoll.go 0% <0%> (ø)
snapshots/overlay/check.go 0% <0%> (ø)
sys/stat_unix.go 0% <0%> (ø)
archive/tar_unix.go 54.54% <0%> (ø)
... and 23 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 80bbaff...55afe33. Read the comment docs.

mlaventure
mlaventure approved these changes May 30, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@mlaventure mlaventure left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented May 30, 2018

LGTM

@crosbymichael crosbymichael merged commit c7083ee into containerd:master May 30, 2018
@dmcgowan dmcgowan deleted the update-grpc branch June 5, 2018 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mlaventure mlaventure mlaventure approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dmcgowan @mlaventure @codecov-io @crosbymichael