github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52365 from grebois/patch-1

Browse Source 
Automatic merge from submit-queue. 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>..

GlusterFS plugin fails to mount volumes in 1.7.3 branch #50463
This commit is contained in:
Kubernetes Submit Queue
2017-09-22 01:48:16 -07:00
committed by GitHub
parent 04673ab614 a2aa36210f
commit 0d0f2e559a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/glusterfs/glusterfs.go
View File

@@ -346,8 +346,8 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
return nil return nil
} }
const invalidOption = "Invalid option auto_unmount" if dstrings.Contains(errs.Error(), "Invalid option auto_unmount") ||
if dstrings.Contains(errs.Error(), invalidOption) { dstrings.Contains(errs.Error(), "Invalid argument") {
// Give a try without `auto_unmount` mount option, because // Give a try without `auto_unmount` mount option, because
// it could be that gluster fuse client is older version and // it could be that gluster fuse client is older version and
// mount.glusterfs is unaware of `auto_unmount`. // mount.glusterfs is unaware of `auto_unmount`.