Liron Ar has uploaded a new change for review.
Change subject: core: Perform hotunplug checks only when dettaching activated
disk
......................................................................
core: Perform hotunplug checks only when dettaching activated disk
When detaching a disk from a vm, the hotplug related checks should be
performed only if the disk is actually plugged to the vm.
Change-Id: Ifc1ac3f30a1f144314cbff51c9c51703d1fb48b1
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/21207/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
index 3715f7e..f73d42f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
@@ -50,15 +50,18 @@
disk = loadDiskFromSnapshot(disk.getId(),
vmDevice.getSnapshotId());
}
}
- if (retValue && Boolean.TRUE.equals(getParameters().isPlugUnPlug())
- && getVm().getStatus() != VMStatus.Down) {
- retValue = isInterfaceSupportedForPlugUnPlug(disk);
- }
- if (retValue && Boolean.FALSE.equals(getParameters().isPlugUnPlug())
- && getVm().getStatus() != VMStatus.Down) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN);
- retValue = false;
+ if (vmDevice.getIsPlugged()) {
+ if (retValue && Boolean.TRUE.equals(getParameters().isPlugUnPlug())
+ && getVm().getStatus() != VMStatus.Down) {
+ retValue = isInterfaceSupportedForPlugUnPlug(disk);
+ }
+
+ if (retValue &&
Boolean.FALSE.equals(getParameters().isPlugUnPlug())
+ && getVm().getStatus() != VMStatus.Down) {
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN);
+ retValue = false;
+ }
}
// Check if disk has no snapshots before detaching it.
--
To view, visit http://gerrit.ovirt.org/21207
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc1ac3f30a1f144314cbff51c9c51703d1fb48b1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
