Skip to content

Fix VM migration with attached ISO #13330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsato03 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −4
Open

Fix VM migration with attached ISO #13330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions ...hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,7 @@ public void storagePoolRefresh(StoragePool pool) {

private void checkNetfsStoragePoolMounted(String uuid) {
String targetPath = _mountPoint + File.separator + uuid;
int mountpointResult = Script.runSimpleBashScriptForExitValue("mountpoint -q " + targetPath);
if (mountpointResult != 0) {
if (!isStoragePoolMounted(targetPath)) {
String errMsg = String.format("libvirt failed to mount storage pool %s at %s", uuid, targetPath);
logger.error(errMsg);
throw new CloudRuntimeException(errMsg);
Expand All @@ -298,9 +297,8 @@ private StoragePool createNetfsStoragePool(PoolType fsType, Connect conn, String
try {
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) {
if (isStoragePoolMounted(targetPath)) {
logger.info("Attempting to unmount old mount at " + targetPath);
String result = Script.runSimpleBashScript("umount -l " + targetPath);
if (result == null) {
Expand Down Expand Up @@ -833,6 +831,12 @@ public KVMStoragePool createStoragePool(String name, String host, int port, Stri
} else if (type == StoragePoolType.CLVM) {
sp = createCLVMStoragePool(conn, name, host, path);
}
} else {
String targetPath = _mountPoint + File.separator + name;
if (type == StoragePoolType.NetworkFilesystem && !isPrimaryStorage && !isStoragePoolMounted(targetPath)) {
String storageMountPoint = host + ":" + path;
mountNfsStoragePool(storageMountPoint, targetPath, nfsMountOpts);
}
}

if (sp == null) {
Expand Down Expand Up @@ -869,6 +873,16 @@ public KVMStoragePool createStoragePool(String name, String host, int port, Stri
}
}

private boolean isStoragePoolMounted(String path) {
return Script.runSimpleBashScriptForExitValue("mountpoint -q " + path) == 0;
}

private void mountNfsStoragePool(String storageMountPoint, String targetPath, List<String> nfsMountOptions) {
String mountOptions = CollectionUtils.isNotEmpty(nfsMountOptions) ? String.format("-o %s", String.join(",", nfsMountOptions)) : "";
logger.debug("Attempting to mount NFS storage [{}] at [{}] with options [{}].", storageMountPoint, targetPath, mountOptions);
Script.runSimpleBashScript(String.format("mount -t nfs %s %s %s", mountOptions, storageMountPoint, targetPath));
}

private boolean destroyStoragePool(Connect conn, String uuid) throws LibvirtException {
StoragePool sp;
try {
Expand Down
Loading