apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

libvirtstorageadaptor: better handle failed libvirt storagepool destroy (#9390)

Browse Source 
If the libvirt mount point is still busy and can't be unmounted
right now, it was waited 5 seconds and an plain unmount was tried,
without cleaning up the libvirt storagepool.
This kept libvirt thinking the storagepool
is active and mounted (which it wasn't).

Now after the plain unmount call, also
the libvirt storagepool will be destroyed.
This commit is contained in:
Rene Peinthor 2024-08-07 09:53:35 +02:00 committed by GitHub
parent 150e7e0b16
commit 21f3fde7b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
View File

@ -766,26 +766,53 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
}
private boolean destroyStoragePool(Connect conn, String uuid) throws LibvirtException {
StoragePool sp;
try {
sp = conn.storagePoolLookupByUUIDString(uuid);
} catch (LibvirtException exc) {
s_logger.warn("Storage pool " + uuid + " doesn't exist in libvirt. Assuming it is already removed");
s_logger.warn(exc.getStackTrace());
return true;
}
if (sp != null) {
if (sp.isPersistent() == 1) {
sp.destroy();
sp.undefine();
} else {
sp.destroy();
}
sp.free();
return true;
} else {
s_logger.warn("Storage pool " + uuid + " doesn't exist in libvirt. Assuming it is already removed");
return false;
}
}
private boolean destroyStoragePoolHandleException(Connect conn, String uuid)
{
try {
return destroyStoragePool(conn, uuid);
} catch (LibvirtException e) {
s_logger.error(String.format("Failed to destroy libvirt pool %s: %s", uuid, e));
}
return false;
}
@Override
public boolean deleteStoragePool(String uuid) {
s_logger.info("Attempting to remove storage pool " + uuid + " from libvirt");
Connect conn = null;
Connect conn;
try {
conn = LibvirtConnection.getConnection();
} catch (LibvirtException e) {
throw new CloudRuntimeException(e.toString());
}
StoragePool sp = null;
Secret s = null;
try {
sp = conn.storagePoolLookupByUUIDString(uuid);
} catch (LibvirtException e) {
s_logger.warn("Storage pool " + uuid + " doesn't exist in libvirt. Assuming it is already removed");
return true;
}
/*
* Some storage pools, like RBD also have 'secret' information stored in libvirt
* Destroy them if they exist
@ -797,13 +824,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
try {
if (sp.isPersistent() == 1) {
sp.destroy();
sp.undefine();
} else {
sp.destroy();
}
sp.free();
destroyStoragePool(conn, uuid);
if (s != null) {
s.undefine();
s.free();
@ -821,6 +842,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
String result = Script.runSimpleBashScript("sleep 5 && umount " + targetPath);
if (result == null) {
s_logger.info("Succeeded in unmounting " + targetPath);
destroyStoragePoolHandleException(conn, uuid);
return true;
}
s_logger.error("Failed to unmount " + targetPath);