github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

fix-binary-check-cephfs

Browse Source
This commit is contained in:
zhangxiaoyu-zidif 2018-01-04 11:08:40 +08:00
parent 745b89bef1
commit ec6b9eb956
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/volume/cephfs/cephfs.go
View File

@ -331,9 +331,8 @@ func (cephfsMounter *cephfsMounter) checkFuseMount() bool {
execute := cephfsMounter.plugin.host.GetExec(cephfsMounter.plugin.GetPluginName())
switch runtime.GOOS {
case "linux":
retBytes, err := execute.Run("/bin/ls", "/sbin/mount.fuse.ceph")
if err == nil && string(retBytes) == "/sbin/mount.fuse.ceph\n" {
glog.V(4).Infof("/sbin/mount.fuse.ceph exists, it should be fuse mount")
if _, err := execute.Run("/usr/bin/test", "-x", "/sbin/mount.fuse.ceph"); err == nil {
glog.V(4).Infof("/sbin/mount.fuse.ceph exists, it should be fuse mount.")
return true
}
return false
@ -356,7 +355,7 @@ func (cephfsVolume *cephfs) execFuseMount(mountpoint string) error {
payload := make(map[string]util.FileProjection, 1)
var fileProjection util.FileProjection
keyring := fmt.Sprintf("[client.%s]\n", cephfsVolume.id) + "key = " + cephfsVolume.secret + "\n"
keyring := fmt.Sprintf("[client.%s]\nkey = %s\n", cephfsVolume.id, cephfsVolume.secret)
fileProjection.Data = []byte(keyring)
fileProjection.Mode = int32(0644)