From d5e583490d946242bdfd26e863dd0aac27c12e3c Mon Sep 17 00:00:00 2001 From: Ramana Raja Date: Wed, 20 Sep 2017 20:27:22 +0530 Subject: [PATCH] ceph_volume_client: perform snapshot operations in ... client configured snap directory name, instead of in hard-coded '.snap' directory. Fixes: http://tracker.ceph.com/issues/21476 Signed-off-by: Ramana Raja (cherry picked from commit f4fc1722594ed007706b54901fb07a2a443d1b96) --- src/pybind/ceph_volume_client.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py index 89722ec95e737..cd9605e919d7c 100644 --- a/src/pybind/ceph_volume_client.py +++ b/src/pybind/ceph_volume_client.py @@ -31,7 +31,6 @@ class RadosError(Exception): RADOS_TIMEOUT = 10 -SNAP_DIR = ".snap" log = logging.getLogger(__name__) @@ -1296,7 +1295,7 @@ class CephFSVolumeClient(object): def _snapshot_path(self, dir_path, snapshot_name): return os.path.join( - dir_path, SNAP_DIR, snapshot_name + dir_path, self.rados.conf_get('client_snapdir'), snapshot_name ) def _snapshot_create(self, dir_path, snapshot_name): -- 2.39.5