[Engine-patches] Change in ovirt-engine[master]: core: cleanup in RunVmCommandBase

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: cleanup in RunVmCommandBase
......................................................................

core: cleanup in RunVmCommandBase

The part that removes hibernation volumes in
RunVmCommandBase#runningSucceeded is redundant now that we store them on
the active snapshot since they are removed by RunVmCommand. Thus, it is
removed.

Change-Id: I355cab35fd090918737f00edd356324c30ce4ca6
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
1 file changed, 0 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/37087/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
index 85ad9b9..035a6a9 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
@@ -9,7 +9,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.context.CommandContext;
 import org.ovirt.engine.core.bll.job.ExecutionContext;
 import org.ovirt.engine.core.bll.job.ExecutionHandler;
@@ -17,11 +16,8 @@
 import org.ovirt.engine.core.bll.scheduling.RunVmDelayer;
 import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator;
 import org.ovirt.engine.core.bll.storage.StorageHelperDirector;
-import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil;
 import org.ovirt.engine.core.common.action.IdParameters;
-import 
org.ovirt.engine.core.common.action.RemoveVmHibernationVolumesParameters;
 import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VdcReturnValueBase;
 import org.ovirt.engine.core.common.action.VmOperationParameterBase;
 import org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;
 import org.ovirt.engine.core.common.businessentities.LUNs;
@@ -182,29 +178,9 @@
             if (getVm().getLastVdsRunOn() == null || 
!getVm().getLastVdsRunOn().equals(getCurrentVdsId())) {
                 getVm().setLastVdsRunOn(getCurrentVdsId());
             }
-
-            if (StringUtils.isNotEmpty(getActiveSnapshot().getMemoryVolume())) 
{
-                removeVmHibernationVolumes();
-                getSnapshotDAO().removeMemoryFromActiveSnapshot(getVmId());
-            }
         }
         finally {
             freeLock();
-        }
-    }
-
-    private void removeVmHibernationVolumes() {
-        RemoveVmHibernationVolumesParameters 
removeVmHibernationVolumesParameters = new 
RemoveVmHibernationVolumesParameters(getVmId());
-        removeVmHibernationVolumesParameters.setParentCommand(getActionType());
-        
removeVmHibernationVolumesParameters.setEntityInfo(getParameters().getEntityInfo());
-        
removeVmHibernationVolumesParameters.setParentParameters(getParameters());
-
-        VdcReturnValueBase vdcRetValue = runInternalActionWithTasksContext(
-                VdcActionType.RemoveVmHibernationVolumes,
-                removeVmHibernationVolumesParameters);
-
-        for (Guid taskId : vdcRetValue.getInternalVdsmTaskIdList()) {
-            CommandCoordinatorUtil.startPollingTask(taskId);
         }
     }
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I355cab35fd090918737f00edd356324c30ce4ca6
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