Skip to content

K
k3s
Unverified Commit b9eaad90 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60788 from php-coder/fix_nfs_comments

Automatic merge from submit-queue (batch tested with PRs 59637, 60611, 60788, 60489, 60687). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. pkg/volume/nfs/nfs.go: correct error messages **What this PR does / why we need it**: We don't use `IsLikelyNotMountPoint()` function since 45d21ee3 commit. This PR updates the error messages to mention a new function instead of the old one.
parents 7887fba3 180535c1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/volume/nfs/nfs.go
View file @ b9eaad90
...@@ -255,7 +255,7 @@ func (b *nfsMounter) SetUpAt(dir string, fsGroup *int64) error { ...@@ -255,7 +255,7 @@ func (b *nfsMounter) SetUpAt(dir string, fsGroup *int64) error {
if err != nil { if err != nil {
notMnt, mntErr := b.mounter.IsNotMountPoint(dir) notMnt, mntErr := b.mounter.IsNotMountPoint(dir)
if mntErr != nil { if mntErr != nil {
glog.Errorf("IsLikelyNotMountPoint check failed: %v", mntErr) glog.Errorf("IsNotMountPoint check failed: %v", mntErr)
return err return err
} }
if !notMnt { if !notMnt {
...@@ -265,7 +265,7 @@ func (b *nfsMounter) SetUpAt(dir string, fsGroup *int64) error { ...@@ -265,7 +265,7 @@ func (b *nfsMounter) SetUpAt(dir string, fsGroup *int64) error {
} }
notMnt, mntErr := b.mounter.IsNotMountPoint(dir) notMnt, mntErr := b.mounter.IsNotMountPoint(dir)
if mntErr != nil { if mntErr != nil {
glog.Errorf("IsLikelyNotMountPoint check failed: %v", mntErr) glog.Errorf("IsNotMountPoint check failed: %v", mntErr)
return err return err
} }
if !notMnt { if !notMnt {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment