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.

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

Fix bug in shim path lookup #2961

Merged
merged 1 commit into from
Jan 30, 2019
Merged

Conversation

jterry75
Copy link
Contributor

Signed-off-by: Justin Terry (VM) juterry@microsoft.com

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
@jterry75
Copy link
Contributor Author

@crosbymichael, @ehazlett - Well that was embarrassing. #2960 had a copy paste bug that compiled by accident and updated the wrong path. Here is the correct fix.

@jterry75
Copy link
Contributor Author

@crosbymichael - What is the build failure here? Its unclear from the logs

@fuweid
Copy link
Member

fuweid commented Jan 29, 2019

it seems that client failed to connect containerd.

failed to dial "\\\\.\\pipe\\containerd-containerd-test": context deadline exceeded: time="2019-01-29T00:49:57.914413800Z" level=debug msg="Stackdump - waiting signal at Global\\containerd-daemon-4624"

@crosbymichael
Copy link
Member

It looks like windows CI is having some issues and is not being stable

@codecov-io
Copy link

Codecov Report

Merging #2961 into master will decrease coverage by 3.28%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2961      +/-   ##
==========================================
- Coverage   47.62%   44.33%   -3.29%     
==========================================
  Files          92      102      +10     
  Lines        8517    10907    +2390     
==========================================
+ Hits         4056     4836     +780     
- Misses       3734     5339    +1605     
- Partials      727      732       +5
Flag Coverage Δ
#linux 47.62% <0%> (ø) ⬆️
#windows 41.22% <0%> (?)
Impacted Files Coverage Δ
runtime/v2/shim/util.go 0% <0%> (ø) ⬆️
snapshots/native/native.go 43.04% <0%> (-9.99%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 43.79% <0%> (-7.07%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 57.84% <0%> (-6.36%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
metadata/images.go 58.46% <0%> (-4.7%) ⬇️
... and 59 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 f35c352...6ed293b. Read the comment docs.

Copy link
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
Member

@fuweid fuweid 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 crosbymichael merged commit 118d321 into containerd:master Jan 30, 2019
@jterry75 jterry75 deleted the fix_typo_path branch January 30, 2019 19:32
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