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

[release/1.6] Bug fix for mount path handling #6929

Merged
merged 1 commit into from May 18, 2022

Conversation

ambarve
Copy link
Contributor

@ambarve ambarve commented May 11, 2022

Currently when handling 'container_path' elements in container mounts we simply call
filepath.Clean on those paths. However, filepath.Clean adds an extra '.' if the path is a
simple drive letter ('E:' or 'Z:' etc.). These type of paths cause failures (with incorrect
parameter error) when creating containers via hcsshim. This commit checks for such paths
and doesn't call filepath.Clean on them.
It also adds a new check to error out if the destination path is a C drive and moves the
dst path checks out of the named pipe condition.

Signed-off-by: Amit Barve ambarve@microsoft.com
(cherry picked from commit bfde58e)
Signed-off-by: Amit Barve ambarve@microsoft.com

Currently when handling 'container_path' elements in container mounts we simply call
filepath.Clean on those paths. However, filepath.Clean adds an extra '.' if the path is a
simple drive letter ('E:' or 'Z:' etc.). These type of paths cause failures (with incorrect
parameter error) when creating containers via hcsshim. This commit checks for such paths
and doesn't call filepath.Clean on them.
It also adds a new check to error out if the destination path is a C drive and moves the
dst path checks out of the named pipe condition.

Signed-off-by: Amit Barve <ambarve@microsoft.com>
(cherry picked from commit bfde58e)
Signed-off-by: Amit Barve <ambarve@microsoft.com>
@k8s-ci-robot
Copy link

Hi @ambarve. 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.

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.

@estesp estesp changed the title Backport Bug fix for mount path handling to 1.6 [release/1.6] backport: Bug fix for mount path handling to 1.6 May 11, 2022
@estesp
Copy link
Member

estesp commented May 11, 2022

Backport of #6651

@kevpar kevpar changed the title [release/1.6] backport: Bug fix for mount path handling to 1.6 [release/1.6] Bug fix for mount path handling May 11, 2022
Copy link
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. CI failure looks like a flake, as it's on Linux and this change only touches _windows files.

@dmcgowan dmcgowan added this to New in Code Review via automation May 11, 2022
@dmcgowan dmcgowan moved this from New to Merge on Green in Code Review May 11, 2022
Copy link
Member

@dcantah dcantah 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 kevpar merged commit c6e0095 into containerd:release/1.6 May 18, 2022
Code Review automation moved this from Merge on Green to Done May 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

6 participants