Merge pull request #120147 from msau42/mount-logs

k8s-publishing-bot · k8s-publishing-bot · commit 70fd466d099d · 2023-10-11T03:46:52.000Z
Move mount warnings to info logs for normal expected paths

Kubernetes-commit: 88f962c95af8c3a5acf0fa76ed4cd3c01c68e6fb
diff --git a/mount_helper_common.go b/mount_helper_common.go
@@ -139,15 +139,15 @@ func removePathIfNotMountPoint(mountPath string, mounter Interface, extensiveMou
 	}
 
 	if notMnt {
-		klog.Warningf("Warning: %q is not a mountpoint, deleting", mountPath)
+		klog.V(4).Infof("%q is not a mountpoint, deleting", mountPath)
 		return notMnt, os.Remove(mountPath)
 	}
 	return notMnt, nil
 }
 
 // removePath attempts to remove the directory. Returns nil if the directory was removed or does not exist.
 func removePath(mountPath string) error {
-	klog.V(4).Infof("Warning: deleting path %q", mountPath)
+	klog.V(4).Infof("Deleting path %q", mountPath)
 	err := os.Remove(mountPath)
 	if os.IsNotExist(err) {
 		klog.V(4).Infof("%q does not exist", mountPath)

Original file line number	Diff line number	Diff line change
`@@ -139,15 +139,15 @@ func removePathIfNotMountPoint(mountPath string, mounter Interface, extensiveMou`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`if notMnt {`
`142`		`- klog.Warningf("Warning: %q is not a mountpoint, deleting", mountPath)`
	`142`	`+ klog.V(4).Infof("%q is not a mountpoint, deleting", mountPath)`
`143`	`143`	`return notMnt, os.Remove(mountPath)`
`144`	`144`	`}`
`145`	`145`	`return notMnt, nil`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`// removePath attempts to remove the directory. Returns nil if the directory was removed or does not exist.`
`149`	`149`	`func removePath(mountPath string) error {`
`150`		`- klog.V(4).Infof("Warning: deleting path %q", mountPath)`
	`150`	`+ klog.V(4).Infof("Deleting path %q", mountPath)`
`151`	`151`	`err := os.Remove(mountPath)`
`152`	`152`	`if os.IsNotExist(err) {`
`153`	`153`	`klog.V(4).Infof("%q does not exist", mountPath)`