Skip to content

go.mod: github.com/Microsoft/hcsshim v0.8.16#5326

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_hcsshim
Apr 10, 2021
Merged

go.mod: github.com/Microsoft/hcsshim v0.8.16#5326
dmcgowan merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_hcsshim

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

full diff: microsoft/hcsshim@v0.8.15...v0.8.16

also updating github.com/Microsoft/hcsshim/test to current master

@thaJeztah
Copy link
Copy Markdown
Member Author

@kevpar @katiewasnothere @cpuguy83 ptal

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 8, 2021

Build succeeded.

@kevpar
Copy link
Copy Markdown
Member

kevpar commented Apr 8, 2021

Looks like test cleanup failed on Windows due to a layer issue. Any idea if we've seen that in CI recently?

@thaJeztah
Copy link
Copy Markdown
Member Author

Looks like test cleanup failed on Windows due to a layer issue. Any idea if we've seen that in CI recently?

Hmm.. not sure; I recall #5133 was merged recently (which I think was to fix that?)

full diff: microsoft/hcsshim@v0.8.15...v0.8.16

also updating github.com/Microsoft/hcsshim/test to current master

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 9, 2021

Build succeeded.

@kevpar
Copy link
Copy Markdown
Member

kevpar commented Apr 9, 2021

The CI failure was due to hcsshim.UnprepareLayer returning this error:

failed to remove test root dir failed to cleanup WCOW layers in C:\Program Files\containerd\root-test\io.containerd.snapshotter.v1.windows\snapshots: failed to unprepare C:\Program Files\containerd\root-test\io.containerd.snapshotter.v1.windows\snapshots\9: hcsshim::UnprepareLayer - failed failed in Win32: The system could not find the instance specified. (0x801f0015)

I did some testing and this seems to be another error case that the cleanup needs to handle. I've pushed #5328 to address this.

Copy link
Copy Markdown
Member

@kevpar kevpar left a comment

Choose a reason for hiding this comment

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

LGTM

kevpar added a commit to kevpar/containerd that referenced this pull request Apr 9, 2021
ForceRemoveAll has special logic on Windows for cleaning up a Windows
snapshotter directory. The logic was missing proper handling for an
error case that can be returned in some cases.

This fixes the CI failure seen in containerd#5326.

Signed-off-by: Kevin Parsons <[email protected]>
@dmcgowan dmcgowan merged commit 2486eb8 into containerd:master Apr 10, 2021
@thaJeztah thaJeztah deleted the bump_hcsshim branch April 10, 2021 08:42
fahedouch pushed a commit to fahedouch/containerd that referenced this pull request Oct 15, 2021
ForceRemoveAll has special logic on Windows for cleaning up a Windows
snapshotter directory. The logic was missing proper handling for an
error case that can be returned in some cases.

This fixes the CI failure seen in containerd#5326.

Signed-off-by: Kevin Parsons <[email protected]>
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.

3 participants