Use UnmountMountPoint util to clean up subpaths #71804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
do-not-merge/work-in-progress
|
/assign @jsafrane |
msau42
commented
Dec 6, 2018
pkg/util/mount/mount_linux.go
Outdated
| } else if IsCorruptedMnt(err) { | ||
| return true, err | ||
| } else { | ||
| // TODO: MSAU: should unknown err return pathExists=true for safety? |
There was a problem hiding this comment.
The original function returned false. I think it should actually return true otherwise we may return cleanup success for unknown errors.
There was a problem hiding this comment.
changed it back to original for now. I see util/file/FileExists also returns false for all errors.
msau42
commented
Dec 26, 2018
pkg/util/mount/mount_linux.go
Outdated
| // PathExists returns true if the specified path exists. | ||
| // TODO: MSAU this is not a good name | ||
| func PathExists(path string, mounter Interface) (bool, error) { | ||
| _, err := mounter.ExistsPath(path) |
There was a problem hiding this comment.
This may not work for containerized kubelet because it would cause the path to be checked based on the host, not inside the kubelet container.
I will change it back to os.Stat(). I will need to figure out a different way to unit test this.
msau42
force-pushed
the
fix-subpath-nfs
branch
from
1492086 to
13852f5
Compare
k8s-ci-robot
added
sig/storage
msau42
force-pushed
the
fix-subpath-nfs
branch
from
13852f5 to
d337701
Compare
|
Still todo:
|
msau42
force-pushed
the
fix-subpath-nfs
branch
from
d337701 to
4abcc08
Compare
k8s-ci-robot
added
size/XL
msau42
force-pushed
the
fix-subpath-nfs
branch
from
9dbb523 to
24526e8
Compare
k8s-ci-robot
added
size/L
msau42
changed the title
k8s-ci-robot
removed
do-not-merge/work-in-progress
msau42
force-pushed
the
fix-subpath-nfs
branch
from
cffda7c to
7a4f906
Compare
k8s-ci-robot
removed
the
needs-rebase
|
/lgtm |
k8s-ci-robot
added
the
lgtm
This was referenced Jan 4, 2019
Closed
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jingxu97, msau42 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/test pull-kubernetes-integration |
|
/retest |
This was referenced Jan 4, 2019
tedyu
reviewed
Jan 7, 2019
| klog.V(4).Infof("%q is unmounted, deleting the directory", mountPath) | ||
| return os.Remove(mountPath) | ||
| } | ||
| return fmt.Errorf("Failed to unmount path %v", mountPath) |
There was a problem hiding this comment.
The message here seems inaccurate : the path is likely mount point
k8s-ci-robot
added a commit
that referenced
this pull request
Jan 7, 2019
…-upstream-release-1.13 Automated cherry pick of #71804: Move unmount volume util from pkg/volume/util to
k8s-ci-robot
added a commit
that referenced
this pull request
Jan 8, 2019
…-upstream-release-1.12 Automated cherry pick of #71804: Move unmount volume util from pkg/volume/util to
k8s-ci-robot
added a commit
that referenced
this pull request
Jan 12, 2019
…-upstream-release-1.11 Automated cherry pick of #71804: Move unmount volume util from pkg/volume/util to
tedyu
reviewed
Oct 10, 2019
| return fmt.Errorf("Failed to unmount path %v", mountPath) | ||
| } | ||
|
|
||
| // TODO: clean this up to use pkg/util/file/FileExists |
There was a problem hiding this comment.
There are more than one version of FileExists:
pkg/kubelet/kubeletconfig/util/files/files.go
vendor/golang.org/x/tools/go/buildutil/util.go
I wonder which one we should use.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
UnmountMountPoint is a wrapper util that handles corrupt and stale mounts. Cleaning subpaths mounts should use the util instead of directly calling Unmount.
Which issue(s) this PR fixes:
Fixes #71584
Special notes for your reviewer:
To make this small for backporting, I've tried to do the minimum changes required and will look into refactoring/cleanup afterwards.
Does this PR introduce a user-facing change?: