Skip to content

CIRCLE / storagedriver

Go to a project
Commit b5f38f5c by Czémán Arnold
Options

disk: small fix

parent a2d1cd02
Showing with 4 additions and 1 deletions
disk.py
...@@ -492,6 +492,7 @@ class CephDisk(Disk): ...@@ -492,6 +492,7 @@ class CephDisk(Disk):
rbd_inst = rbd.RBD() rbd_inst = rbd.RBD()
logging.info("Create ceph block: %s (%s)" % (self.get_path(), logging.info("Create ceph block: %s (%s)" % (self.get_path(),
str(self.size))) str(self.size)))
# NOTE: http://docs.ceph.com/docs/master/rbd/rbd-snapshot/#layering
rbd_inst.create(ioctx, self.name, self.size, old_format=False, rbd_inst.create(ioctx, self.name, self.size, old_format=False,
features=rbd.RBD_FEATURE_LAYERING) features=rbd.RBD_FEATURE_LAYERING)
except rbd.ImageExists: except rbd.ImageExists:
...@@ -622,7 +623,7 @@ class CephDisk(Disk): ...@@ -622,7 +623,7 @@ class CephDisk(Disk):
rbd_inst = rbd.RBD() rbd_inst = rbd.RBD()
logging.info("Snapshot ceph block: %s (%s)" % (self.get_path(), logging.info("Snapshot ceph block: %s (%s)" % (self.get_path(),
self.get_base())) self.get_base()))
# NOTE: http://docs.ceph.com/docs/master/rbd/rbd-snapshot/#layering
rbd_inst.clone(ioctx, self.base_name, "snapshot", rbd_inst.clone(ioctx, self.base_name, "snapshot",
ioctx, self.name, features=rbd.RBD_FEATURE_LAYERING) ioctx, self.name, features=rbd.RBD_FEATURE_LAYERING)
except rbd.ImageExists: except rbd.ImageExists:
...@@ -659,6 +660,8 @@ class CephDisk(Disk): ...@@ -659,6 +660,8 @@ class CephDisk(Disk):
logger.warning("Aborted merge job, removing %s", logger.warning("Aborted merge job, removing %s",
new_disk.get_path()) new_disk.get_path())
with rbd.Image(ioctx, new_disk.name) as image: with rbd.Image(ioctx, new_disk.name) as image:
image.unprotect_snap("snapshot")
image.remove_snap("snapshot")
rbd_inst = rbd.RBD() rbd_inst = rbd.RBD()
rbd_inst.remove(new_disk.name) rbd_inst.remove(new_disk.name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment