From: Royce Lv <lvroyce(a)linux.vnet.ibm.com&gt; If ref count remains in system after volume delete, it will cause side effect in creating a volume of same name. Fix this by deleting reference count when deleting storage volume. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com&gt; --- src/kimchi/model/diskutils.py | 13 +++++++++++++ src/kimchi/model/storagevolumes.py | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/diskutils.py b/src/kimchi/model/diskutils.py index 1d575cb..7eb24d2 100644 --- a/src/kimchi/model/diskutils.py +++ b/src/kimchi/model/diskutils.py @@ -73,3 +73,16 @@ def set_disk_ref_cnt(objstore, path, new_count): session.store('storagevolume', path, {'ref_cnt': new_count}) except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) + + +def clean_disk_ref_cnt(objstore, path): + try: + with objstore as session: + session.delete('storagevolume', path) + except NotFoundError: + pass + except Exception as e: + kimchi_log.error('Unable to delete storage volume in' + ' objectstore due error: %s', + e.message) + raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 406b38b..cf83b0e 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -30,7 +30,7 @@ from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter, IsoFormatError from kimchi.exception import MissingParameter, NotFoundError, OperationFailed from kimchi.isoinfo import IsoImage -from kimchi.model.diskutils import get_disk_ref_cnt +from kimchi.model.diskutils import get_disk_ref_cnt, clean_disk_ref_cnt from kimchi.model.storagepools import StoragePoolModel from kimchi.model.tasks import TaskModel from kimchi.utils import add_task, get_next_clone_name, kimchi_log @@ -306,6 +306,7 @@ class StorageVolumeModel(object): raise InvalidParameter("KCHVOL0012E", {'type': pool_info['type']}) volume = self._get_storagevolume(pool, name) + clean_disk_ref_cnt(self.objstore, volume.path()) try: volume.delete(0) except libvirt.libvirtError as e: -- 1.9.3