fix mount unmount failure for a Windows pod #63272

andyzhangx · 2018-04-28T05:22:15Z

What this PR does / why we need it:
IsLikelyNotMountPoint func does not return correctly, for invalid symlink, it should return true(not a mount point), now it will always return false:

kubernetes/pkg/util/mount/mount_windows.go

Lines 141 to 148 in 7711d88

    
           func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) { 
        
           	stat, err := os.Lstat(file) 
        
           	if err != nil { 
        
           		return true, err 
        
           	} 
        
           	// If current file is a symlink, then it is a mountpoint. 
        
           	if stat.Mode()&os.ModeSymlink != 0 { 
        
           		return false, nil

kubernetes/pkg/volume/util/util.go

Lines 147 to 163 in 7711d88

    
           func doUnmountMountPoint(mountPath string, mounter mount.Interface, extensiveMountPointCheck bool, corruptedMnt bool) error { 
        
           	if !corruptedMnt { 
        
           		var notMnt bool 
        
           		var err error 
        
           		if extensiveMountPointCheck { 
        
           			notMnt, err = mount.IsNotMountPoint(mounter, mountPath) 
        
           		} else { 
        
           			notMnt, err = mounter.IsLikelyNotMountPoint(mountPath) 
        
           		} 
        
           		if err != nil { 
        
           			return err 
        
           		} 
        
           		if notMnt { 
        
           			glog.Warningf("Warning: %q is not a mountpoint, deleting", mountPath) 
        
           			return os.Remove(mountPath)

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #63249

Special notes for your reviewer:

Release note:

fix mount unmount failure for a Windows pod

/sig windows
/assign @msau42

andyzhangx · 2018-04-28T05:22:48Z

/test pull-kubernetes-cross

msau42 · 2018-04-30T23:58:19Z

pkg/util/mount/mount_windows_test.go

+
+	for _, test := range tests {
+		filePath := filepath.Join(base, test.fileName)
+		if test.fileValid {


You could potentially pass in a setup method per test case, instead of combining all the scenarios here, to make it easier to comprehend each test case separately.

@msau42 thanks for the suggestion, I have made a new commit with setUp func, the test code is more clear now

andyzhangx

@msau42 thanks for the suggestion, I have made a new commit with setUp func, the test code is more clear now

andyzhangx · 2018-05-01T02:41:31Z

pkg/util/mount/mount_windows_test.go

+
+	for _, test := range tests {
+		filePath := filepath.Join(base, test.fileName)
+		if test.fileValid {


@msau42 thanks for the suggestion, I have made a new commit with setUp func, the test code is more clear now

andyzhangx · 2018-05-01T02:41:57Z

/test pull-kubernetes-cross

andyzhangx · 2018-05-01T05:26:00Z

/test pull-kubernetes-verify

andyzhangx · 2018-05-02T03:32:17Z

/test pull-kubernetes-verify

andyzhangx · 2018-05-03T06:45:46Z

/test pull-kubernetes-verify

andyzhangx · 2018-05-03T13:04:01Z

@msau42 PTAL, thanks.

msau42 · 2018-05-07T18:29:24Z

pkg/util/mount/mount_windows_test.go

+
+func TestIsLikelyNotMountPoint(t *testing.T) {
+	mounter := Mounter{"fake/path"}
+	base, err := ioutil.TempDir("", "TestIsLikelyNotMountPoint")


Should you make the TempDir per test case so that you won't run into name collision issues?

@msau42 I have already merged a PR: #63399 which fixes this issue, and also rebased on the latest master branch, now every test case in mount_windows_test.go will make TempDir

I actually mean each test case in tests uses a new tmpdir. That way you don't need to rely on each test case filename to be unique

Hi @msau42 actually ioutil.TempDir("", "") will create a new tmpdir with a unique name, add a prefix like "TestIsLikelyNotMountPoint" is for debugging purpose, so when it fails, I could comment out defer os.RemoveAll(base) and find the tmp directory easily. Anyway, whether I set prefix or not, ioutil.TempDir will still create a unique dir.

Sorry I think I'm not being clear. I was suggesting a new tempdir for each iteration in the testcase loop

@msau42 good point, I have changed the test case, create a new tempdir for every single test case, PTAL

fix comments fix comments on unit test fix comments

msau42 · 2018-05-09T15:39:29Z

/lgtm

andyzhangx · 2018-05-09T22:54:11Z

/test pull-kubernetes-e2e-gce

andyzhangx · 2018-05-09T22:54:57Z

/assign @jsafrane PTAL, thanks

andyzhangx · 2018-05-13T13:42:35Z

/test pull-kubernetes-bazel-test
/test pull-kubernetes-e2e-kops-aws

jsafrane · 2018-05-15T08:56:04Z

/approve

k8s-ci-robot · 2018-05-15T08:56:11Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, jsafrane, 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:

~~pkg/util/mount/OWNERS~~ [jsafrane]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-github-robot · 2018-05-15T10:44:59Z

/test all [submit-queue is verifying that this PR is safe to merge]

andyzhangx · 2018-05-15T11:22:11Z

/test pull-kubernetes-integration

k8s-github-robot · 2018-05-15T11:47:08Z

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

…ase-1.10' of https://github.com/andyzhangx/kubernetes into automated-cherry-pick-of-kubernetes#63272-upstream-release-1.10

…3272-upstream-release-1.9 Automatic merge from submit-queue. Automated cherry pick of #63272: fix IsLikelyNotMountPoint func on Windows Cherry pick of #63272 on release-1.9. #63272: fix IsLikelyNotMountPoint func on Windows

…3272-upstream-release-1.10 Automatic merge from submit-queue. Automated cherry pick of #63272: fix IsLikelyNotMountPoint func on Windows Cherry pick of #63272 on release-1.10. #63272: fix IsLikelyNotMountPoint func on Windows

k8s-ci-robot assigned msau42 Apr 28, 2018

k8s-ci-robot requested review from jingxu97 and msau42 April 28, 2018 05:22

andyzhangx force-pushed the IsLikelyNotMountPoint-windows-fix branch from 1c1dfda to 4e92e60 Compare April 28, 2018 06:46

msau42 reviewed Apr 30, 2018

View reviewed changes

andyzhangx force-pushed the IsLikelyNotMountPoint-windows-fix branch from 4e92e60 to f3698b0 Compare May 1, 2018 02:40

andyzhangx commented May 1, 2018

View reviewed changes

msau42 reviewed May 7, 2018

View reviewed changes

fix IsLikelyNotMountPoint func on Windows

5671cd8

andyzhangx force-pushed the IsLikelyNotMountPoint-windows-fix branch from f3698b0 to 51b0649 Compare May 8, 2018 05:51

add IsLikelyNotMountPoint test on Windows

1d24f48

fix comments fix comments on unit test fix comments

andyzhangx force-pushed the IsLikelyNotMountPoint-windows-fix branch from 51b0649 to 1d24f48 Compare May 9, 2018 02:41

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 9, 2018

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2018

k8s-github-robot merged commit 89b747b into kubernetes:master May 15, 2018

This was referenced Jun 4, 2018

Automated cherry pick of #63272: fix IsLikelyNotMountPoint func on Windows #64678

Closed

Automated cherry pick of #63272: fix IsLikelyNotMountPoint func on Windows #64679

Merged

andyzhangx mentioned this pull request Jun 8, 2018

Automated cherry pick of #63272: fix IsLikelyNotMountPoint func on Windows #64900

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix mount unmount failure for a Windows pod #63272

fix mount unmount failure for a Windows pod #63272

andyzhangx commented Apr 28, 2018

andyzhangx commented Apr 28, 2018

msau42 Apr 30, 2018

andyzhangx May 1, 2018

andyzhangx left a comment

andyzhangx May 1, 2018

andyzhangx commented May 1, 2018

andyzhangx commented May 1, 2018

andyzhangx commented May 2, 2018

andyzhangx commented May 3, 2018

andyzhangx commented May 3, 2018

msau42 May 7, 2018

andyzhangx May 8, 2018

msau42 May 8, 2018

andyzhangx May 9, 2018

msau42 May 9, 2018

andyzhangx May 9, 2018

msau42 commented May 9, 2018

andyzhangx commented May 9, 2018

andyzhangx commented May 9, 2018

andyzhangx commented May 13, 2018

jsafrane commented May 15, 2018

k8s-ci-robot commented May 15, 2018

k8s-github-robot commented May 15, 2018

andyzhangx commented May 15, 2018

k8s-github-robot commented May 15, 2018

	func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {
	stat, err := os.Lstat(file)
	if err != nil {
	return true, err
	}
	// If current file is a symlink, then it is a mountpoint.
	if stat.Mode()&os.ModeSymlink != 0 {
	return false, nil

	func doUnmountMountPoint(mountPath string, mounter mount.Interface, extensiveMountPointCheck bool, corruptedMnt bool) error {
	if !corruptedMnt {
	var notMnt bool
	var err error
	if extensiveMountPointCheck {
	notMnt, err = mount.IsNotMountPoint(mounter, mountPath)
	} else {
	notMnt, err = mounter.IsLikelyNotMountPoint(mountPath)
	}

	if err != nil {
	return err
	}

	if notMnt {
	glog.Warningf("Warning: %q is not a mountpoint, deleting", mountPath)
	return os.Remove(mountPath)

fix mount unmount failure for a Windows pod #63272

fix mount unmount failure for a Windows pod #63272

Conversation

andyzhangx commented Apr 28, 2018

andyzhangx commented Apr 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andyzhangx left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andyzhangx commented May 1, 2018

andyzhangx commented May 1, 2018

andyzhangx commented May 2, 2018

andyzhangx commented May 3, 2018

andyzhangx commented May 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

msau42 commented May 9, 2018

andyzhangx commented May 9, 2018

andyzhangx commented May 9, 2018

andyzhangx commented May 13, 2018

jsafrane commented May 15, 2018

k8s-ci-robot commented May 15, 2018

k8s-github-robot commented May 15, 2018

andyzhangx commented May 15, 2018

k8s-github-robot commented May 15, 2018