Merge "Fix ceph incremental backup fail"
This commit is contained in:
commit
a1b0dda617
|
@ -120,8 +120,9 @@ class RBDConnector(base.BaseLinuxConnector):
|
||||||
rbd_volume = linuxrbd.RBDVolume(rbd_client, volume)
|
rbd_volume = linuxrbd.RBDVolume(rbd_client, volume)
|
||||||
rbd_handle = linuxrbd.RBDVolumeIOWrapper(
|
rbd_handle = linuxrbd.RBDVolumeIOWrapper(
|
||||||
linuxrbd.RBDImageMetadata(rbd_volume, pool, user, conf))
|
linuxrbd.RBDImageMetadata(rbd_volume, pool, user, conf))
|
||||||
finally:
|
except Exception:
|
||||||
fileutils.delete_if_exists(conf)
|
fileutils.delete_if_exists(conf)
|
||||||
|
raise
|
||||||
|
|
||||||
return rbd_handle
|
return rbd_handle
|
||||||
|
|
||||||
|
@ -223,6 +224,7 @@ class RBDConnector(base.BaseLinuxConnector):
|
||||||
if device_info:
|
if device_info:
|
||||||
rbd_handle = device_info.get('path', None)
|
rbd_handle = device_info.get('path', None)
|
||||||
if rbd_handle is not None:
|
if rbd_handle is not None:
|
||||||
|
fileutils.delete_if_exists(rbd_handle.rbd_conf)
|
||||||
rbd_handle.close()
|
rbd_handle.close()
|
||||||
|
|
||||||
def check_valid_device(self, path, run_as_root=True):
|
def check_valid_device(self, path, run_as_root=True):
|
||||||
|
|
Loading…
Reference in New Issue