import ceph octopus 15.2.17

[ceph.git] / ceph / src / pybind / mgr / volumes / fs / operations / group.py

diff --git a/ceph/src/pybind/mgr/volumes/fs/operations/group.py b/ceph/src/pybind/mgr/volumes/fs/operations/group.py
index bcf1bc2fd73324ea8057dc2f51a5d9bdd61d1fc2..69e3959d7aa3d2ab684967854c9613382fe4d933 100644 (file)
--- a/ceph/src/pybind/mgr/volumes/fs/operations/group.py
+++ b/ceph/src/pybind/mgr/volumes/fs/operations/group.py
@@ -8,7 +8,7 @@ import cephfs
 from .snapshot_util import mksnap, rmsnap
 from .pin_util import pin
 from .template import GroupTemplate
-from ..fs_util import listdir, listsnaps, get_ancestor_xattr
+from ..fs_util import listdir, listsnaps, get_ancestor_xattr, create_base_dir
 from ..exception import VolumeException
 
 log = logging.getLogger(__name__)
@@ -102,7 +102,11 @@ def create_group(fs, vol_spec, groupname, pool, mode, uid, gid):
     """
     group = Group(fs, vol_spec, groupname)
     path = group.path
-    fs.mkdirs(path, mode)
+    vol_spec_base_dir = group.vol_spec.base_dir.encode('utf-8')
+
+    # create vol_spec base directory with default mode(0o755) if it doesn't exist
+    create_base_dir(fs, vol_spec_base_dir, vol_spec.DEFAULT_MODE)
+    fs.mkdir(path, mode)
     try:
         if not pool:
             pool = get_ancestor_xattr(fs, path, "ceph.dir.layout.pool")