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

Merge branch '4.11'

Browse Source 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2018-06-07 16:07:52 +05:30
commit 5c28a2a5b8
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,45 +147,25 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
StoragePool sp = null; StoragePool sp = null;
try { try {
s_logger.debug(spd.toString()); s_logger.debug(spd.toString());
// check whether the pool is already mounted
int mountpointResult = Script.runSimpleBashScriptForExitValue("mountpoint -q " + targetPath);
// if the pool is mounted, try to unmount it
if(mountpointResult == 0) {
s_logger.info("Attempting to unmount old mount at " + targetPath);
String result = Script.runSimpleBashScript("umount -l " + targetPath);
if (result == null) {
s_logger.info("Succeeded in unmounting " + targetPath);
} else {
s_logger.error("Failed in unmounting storage");
}
}
sp = conn.storagePoolCreateXML(spd.toString(), 0); sp = conn.storagePoolCreateXML(spd.toString(), 0);
return sp; return sp;
} catch (LibvirtException e) { } catch (LibvirtException e) {
s_logger.error(e.toString()); s_logger.error(e.toString());
// if error is that pool is mounted, try to handle it
if (e.toString().contains("already mounted")) {
s_logger.error("Attempting to unmount old mount libvirt is unaware of at " + targetPath);
String result = Script.runSimpleBashScript("umount -l " + targetPath);
if (result == null) {
s_logger.error("Succeeded in unmounting " + targetPath);
try {
sp = conn.storagePoolCreateXML(spd.toString(), 0);
s_logger.error("Succeeded in redefining storage");
return sp;
} catch (LibvirtException l) {
s_logger.error("Target was already mounted, unmounted it but failed to redefine storage:" + l);
}
} else {
s_logger.error("Failed in unmounting and redefining storage");
}
} else {
s_logger.error("Internal error occurred when attempting to mount: specified path may be invalid");
throw e; throw e;
} }
if (sp != null) {
try {
if (sp.isPersistent() == 1) {
sp.destroy();
sp.undefine();
} else {
sp.destroy();
}
sp.free();
} catch (LibvirtException l) {
s_logger.debug("Failed to undefine " + fsType.toString() + " storage pool with: " + l.toString());
}
}
return null;
}
} }
private StoragePool createSharedStoragePool(Connect conn, String uuid, String host, String path) { private StoragePool createSharedStoragePool(Connect conn, String uuid, String host, String path) {