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

libvirtstorage: Make sure netfs storage was really mounted (#8887)

Browse Source
This commit is contained in:
Rene Peinthor 2024-06-23 16:11:02 +02:00 committed by GitHub
parent 7e00678691
commit f4612c51ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,6 +272,16 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
} }
} }
private void checkNetfsStoragePoolMounted(String uuid) {
String targetPath = _mountPoint + File.separator + uuid;
int mountpointResult = Script.runSimpleBashScriptForExitValue("mountpoint -q " + targetPath);
if (mountpointResult != 0) {
String errMsg = String.format("libvirt failed to mount storage pool %s at %s", uuid, targetPath);
s_logger.error(errMsg);
throw new CloudRuntimeException(errMsg);
}
}
private StoragePool createNetfsStoragePool(PoolType fsType, Connect conn, String uuid, String host, String path) throws LibvirtException { private StoragePool createNetfsStoragePool(PoolType fsType, Connect conn, String uuid, String host, String path) throws LibvirtException {
String targetPath = _mountPoint + File.separator + uuid; String targetPath = _mountPoint + File.separator + uuid;
LibvirtStoragePoolDef spd = new LibvirtStoragePoolDef(fsType, uuid, uuid, host, path, targetPath); LibvirtStoragePoolDef spd = new LibvirtStoragePoolDef(fsType, uuid, uuid, host, path, targetPath);
@ -692,6 +702,10 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
sp.create(0); sp.create(0);
} }
if (type == StoragePoolType.NetworkFilesystem) {
checkNetfsStoragePoolMounted(name);
}
return getStoragePool(name); return getStoragePool(name);
} catch (LibvirtException e) { } catch (LibvirtException e) {
String error = e.toString(); String error = e.toString();
@ -756,10 +770,10 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
if (e.toString().contains("exit status 16")) { if (e.toString().contains("exit status 16")) {
String targetPath = _mountPoint + File.separator + uuid; String targetPath = _mountPoint + File.separator + uuid;
s_logger.error("deleteStoragePool removed pool from libvirt, but libvirt had trouble unmounting the pool. Trying umount location " + targetPath + s_logger.error("deleteStoragePool removed pool from libvirt, but libvirt had trouble unmounting the pool. Trying umount location " + targetPath +
"again in a few seconds"); " again in a few seconds");
String result = Script.runSimpleBashScript("sleep 5 && umount " + targetPath); String result = Script.runSimpleBashScript("sleep 5 && umount " + targetPath);
if (result == null) { if (result == null) {
s_logger.error("Succeeded in unmounting " + targetPath); s_logger.info("Succeeded in unmounting " + targetPath);
return true; return true;
} }
s_logger.error("Failed to unmount " + targetPath); s_logger.error("Failed to unmount " + targetPath);