Updated Branches: refs/heads/4.2 223b2729d -> 7234af625
CLOUDSTACK-5661 [VMware] DetachIsoCmd succeeds even though cdrom is locked by VM as cdrom is mounted DetachISO is succeeding even though detach opeartion is failing as cdrom is locked by VM as it was mounted inside VM. Detect if cdrom is locked or not. If locked fail detach operation and warn user to unmount before detaching the iso/cdrom device. Signed-off-by: Sateesh Chodapuneedi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7234af62 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7234af62 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7234af62 Branch: refs/heads/4.2 Commit: 7234af6258bd209769f8f44e95ecbdf7b1cb55fa Parents: 223b272 Author: Sateesh Chodapuneedi <[email protected]> Authored: Fri Dec 27 17:15:35 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Fri Dec 27 17:19:26 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 5 ++++- .../cloud/storage/resource/VmwareStorageProcessor.java | 4 +++- .../cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 12 +++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7234af62/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index d198adb..f6ad2b6 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -4922,7 +4922,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.mountToolsInstaller(); } else { try{ - vmMo.unmountToolsInstaller(); + if (!vmMo.unmountToolsInstaller()) { + return new Answer(cmd, false, + "Failed to unmount vmware-tools installer ISO as the corresponding CDROM device is locked by VM. Please unmount the CDROM device inside the VM and ret-try."); + } }catch(Throwable e){ vmMo.detachIso(null); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7234af62/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java index 9538176..40730a7 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -1316,7 +1316,9 @@ public class VmwareStorageProcessor implements StorageProcessor { vmMo.mountToolsInstaller(); } else { try{ - vmMo.unmountToolsInstaller(); + if (!vmMo.unmountToolsInstaller()) { + return new AttachAnswer("Failed to unmount vmware-tools installer ISO as the corresponding CDROM device is locked by VM. Please unmount the CDROM device inside the VM and ret-try."); + } } catch(Throwable e){ vmMo.detachIso(null); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7234af62/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index 126b67d..7bfb5c6 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -2364,11 +2364,13 @@ public class VirtualMachineMO extends BaseMO { _context.getService().mountToolsInstaller(_mor); } - public void unmountToolsInstaller() throws Exception { + public boolean unmountToolsInstaller() throws Exception { int i = 1; // Monitor VM questions final Boolean[] flags = {false}; final VirtualMachineMO vmMo = this; + final boolean[] encounterQuestion = new boolean[1]; + encounterQuestion[0] = false; Future<?> future = _monitorServiceExecutor.submit(new Runnable() { @Override public void run() { @@ -2379,6 +2381,7 @@ public class VirtualMachineMO extends BaseMO { VirtualMachineRuntimeInfo runtimeInfo = vmMo.getRuntimeInfo(); VirtualMachineQuestionInfo question = runtimeInfo.getQuestion(); if (question != null) { + encounterQuestion[0] = true; if (s_logger.isTraceEnabled()) { s_logger.trace("Question id: " + question.getId()); s_logger.trace("Question text: " + question.getText()); @@ -2445,6 +2448,13 @@ public class VirtualMachineMO extends BaseMO { flags[0] = true; future.cancel(true); } + if (encounterQuestion[0]) { + s_logger.warn("cdrom is locked by VM. Failed to detach the ISO."); + return false; + } else { + s_logger.info("Successfully unmounted tools installer from VM."); + return true; + } } public void redoRegistration(ManagedObjectReference morHost) throws Exception {
