[Engine-patches] Change in ovirt-engine[master]: core: no powering-up event on migrating-from to up transition

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: no powering-up event on migrating-from to up transition
......................................................................

core: no powering-up event on migrating-from to up transition

Do not call IVdsAsyncCommand#onPowerringUp when VM status switch from
MIGRATING_TO to UP. The rerun mechanism of the command should decrease
the pending resources.

Change-Id: Ib1c57900fd3fbc0cb9a5953bee90e53ab11ef7c4
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/34663/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index 2a986be..4937be4 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -1785,7 +1786,7 @@
                 if (vmToUpdate != null) {
                     logVmStatusTransition(vmToUpdate, runningVm);
 
-                    if ((vmToUpdate.getStatus() != VMStatus.Up && 
vmToUpdate.getStatus() != VMStatus.PoweringUp && runningVm.getStatus() == 
VMStatus.Up)
+                    if ((!EnumSet.of(VMStatus.Up, VMStatus.PoweringUp, 
VMStatus.MigratingFrom).contains(vmToUpdate.getStatus()) && 
runningVm.getStatus() == VMStatus.Up)
                             || (vmToUpdate.getStatus() != VMStatus.PoweringUp 
&& runningVm.getStatus() == VMStatus.PoweringUp)) {
                         _poweringUpVms.add(runningVm);
                     }


-- 
To view, visit http://gerrit.ovirt.org/34663
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1c57900fd3fbc0cb9a5953bee90e53ab11ef7c4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches