From 6f2f972f5b097d6d87654a890819b4bcfb101dc1 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 21 Sep 2020 14:04:25 +0200 Subject: [PATCH] cephfs: trim spaces around fuseMountOptions When passing fuseMountOptions: debug in the StorageClass, the mount options passed on the ceph-fuse commandline result in "-o nonempty ,debug". The additional space before the ",debug" causes the mount command to fail. Fixes: 1485 Signed-off-by: Niels de Vos --- internal/cephfs/volumemounter.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/cephfs/volumemounter.go b/internal/cephfs/volumemounter.go index ee5e41732..67bd6eb89 100644 --- a/internal/cephfs/volumemounter.go +++ b/internal/cephfs/volumemounter.go @@ -154,12 +154,13 @@ func mountFuse(ctx context.Context, mountPoint string, cr *util.Credentials, vol "-c", util.CephConfigPath, "-n", cephEntityClientPrefix + cr.ID, "--keyfile=" + cr.KeyFile, "-r", volOptions.RootPath, - "-o", "nonempty", } + fmo := "nonempty" if volOptions.FuseMountOptions != "" { - args = append(args, ","+volOptions.FuseMountOptions) + fmo += "," + strings.TrimSpace(volOptions.FuseMountOptions) } + args = append(args, "-o", fmo) if volOptions.FsName != "" { args = append(args, "--client_mds_namespace="+volOptions.FsName)