From: Ramana Raja <rraja@redhat.com>
Date: Thu, 23 Jun 2016 11:01:23 +0000 (+0530)
Subject: ceph_volume_client: create/delete VMeta for create/delete volume
X-Git-Tag: ses5-milestone5~353^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37fbfc7aa8f10d37f5202603a906425507271ff5;p=ceph.git

ceph_volume_client: create/delete VMeta for create/delete volume

Create and delete volume meta files during creation and deletion of
volumes.

Signed-off-by: Ramana Raja <rraja@redhat.com>
---

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index 174b4b85ccee..1a5b3dc21d4b 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -231,7 +231,6 @@ class CephFSVolumeClient(object):
         # UUID
         self._id = struct.unpack(">Q", uuid.uuid1().get_bytes()[0:8])[0]
 
-        # TODO: remove .meta files on volume deletion
         # TODO: remove .meta files on last rule for an auth ID deletion
         # TODO: version the on-disk structures
 
@@ -608,6 +607,12 @@ class CephFSVolumeClient(object):
         log.info("create_volume: {0}, using rados namespace {1} to isolate data.".format(volume_path, namespace))
         self.fs.setxattr(path, 'ceph.dir.layout.pool_namespace', namespace, 0)
 
+        # Create a volume meta file, if it does not already exist, to store
+        # data about auth ids having access to the volume
+        fd = self.fs.open(self._volume_metadata_path(volume_path),
+                          os.O_CREAT, 0755)
+        self.fs.close(fd)
+
         return {
             'mount_path': path
         }
@@ -641,6 +646,13 @@ class CephFSVolumeClient(object):
         else:
             self.fs.rename(path, trashed_volume)
 
+        # Delete the volume meta file, if it's not already deleted
+        vol_meta_path = self._volume_metadata_path(volume_path)
+        try:
+            self.fs.unlink(vol_meta_path)
+        except cephfs.ObjectNotFound:
+            pass
+
     def purge_volume(self, volume_path, data_isolated=False):
         """
         Finish clearing up a volume that was previously passed to delete_volume.  This