Skip to content

[release/1.5] Use deactivatelayer to recover layers that we cannot rename #6133

Merged
estesp merged 2 commits intocontainerd:release/1.5from
dcantah:backport-deactivatelayer
Oct 19, 2021
Merged

[release/1.5] Use deactivatelayer to recover layers that we cannot rename #6133
estesp merged 2 commits intocontainerd:release/1.5from
dcantah:backport-deactivatelayer

Conversation

@dcantah
Copy link
Copy Markdown
Member

@dcantah dcantah commented Oct 19, 2021

It seems that something has shifted in an API, and vhd.DetachVhd is
returning "failed to open virtual disk: invalid argument" on Windows
Server LTSC 2019.

Signed-off-by: Paul "TBBle" Hampson [email protected]
(cherry picked from commit f216270)
Signed-off-by: Daniel Canter [email protected]

TBBle and others added 2 commits October 18, 2021 17:08
@TBBle @dcantah
Use DeactivateLayer to recover layers that we cannot rename
6094bc7 
It seems that something has shifted in an API, and vhd.DetachVhd is
returning "failed to open virtual disk: invalid argument" on Windows
Server LTSC 2019.

Signed-off-by: Paul "TBBle" Hampson <[email protected]>
(cherry picked from commit f216270)
Signed-off-by: Daniel Canter <[email protected]>
@dcantah
Fix spelling mistake in Windows snapshotter
16762f3 
deactvateErr -> deactivateErr

Signed-off-by: Daniel Canter <[email protected]>
(cherry picked from commit c18c2e7)
Signed-off-by: Daniel Canter <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Oct 19, 2021

Hi @dcantah. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 19, 2021

Build succeeded.

@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Oct 19, 2021

/ok-to-test

samuelkarp
samuelkarp approved these changes Oct 19, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM

Zyqsempai
Zyqsempai approved these changes Oct 19, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

estesp
estesp approved these changes Oct 19, 2021
View reviewed changes
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

@estesp
Copy link
Copy Markdown
Member

estesp commented Oct 19, 2021

Ignoring Linux runs being canceled after 30m as this code change is Windows only; seems we may have to bump Linux test timeout limits in release/1.5 as GHA seems to be more overloaded than when we first migrated.

@estesp estesp merged commit a39e6bf into containerd:release/1.5 Oct 19, 2021
@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Oct 19, 2021 •
edited
Loading

@estesp I can send a pr to bump the timeout shortly. I saw we'd bumped it on main

@AkihiroSuda AkihiroSuda mentioned this pull request Nov 18, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samuelkarp samuelkarp samuelkarp approved these changes

@estesp estesp estesp approved these changes

+1 more reviewer

@Zyqsempai Zyqsempai Zyqsempai approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dcantah @k8s-ci-robot @samuelkarp @estesp @Zyqsempai @TBBle