Arik Hadas has uploaded a new change for review. Change subject: core: rename VmPoolHandler -> DownVmsHandler ......................................................................
core: rename VmPoolHandler -> DownVmsHandler Change-Id: Ic8840b8cba0fcec68936f0f24abc9948568cca0d Signed-off-by: Arik Hadas <aha...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DownVmsHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java 6 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/28144/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java index 6158c1d..8f1dc98 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java @@ -59,7 +59,7 @@ LogSettingVmToDown(getVds().getId(), vm.getId()); } - VmPoolHandler.processVmPoolOnStopVm(vm.getId(), + DownVmsHandler.processVmPoolOnStopVm(vm.getId(), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DownVmsHandler.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DownVmsHandler.java index 2d47a69..415623e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DownVmsHandler.java @@ -26,7 +26,7 @@ import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -public class VmPoolHandler { +public class DownVmsHandler { /** * VM should be return to pool after it stopped unless Manual Return VM To Pool chosen. @@ -136,12 +136,12 @@ public static void removeVmStatelessImages(Guid vmId, CommandContext context) { if (DbFacade.getInstance().getSnapshotDao().exists(vmId, SnapshotType.STATELESS)) { - log.infoFormat("VdcBll.VmPoolHandler.processVmPoolOnStopVm - Deleting snapshot for stateless vm {0}", vmId); + log.infoFormat("Deleting snapshot for stateless vm {0}", vmId); Backend.getInstance().runInternalAction(VdcActionType.RestoreStatelessVm, new VmOperationParameterBase(vmId), context); } } - private static final Log log = LogFactory.getLog(VmPoolHandler.class); + private static final Log log = LogFactory.getLog(DownVmsHandler.class); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index c964f84..b19c246 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -482,7 +482,7 @@ setVmId(vm.getId()); setVmName(vm.getName()); setVm(vm); - VmPoolHandler.processVmPoolOnStopVm(vm.getId(), + DownVmsHandler.processVmPoolOnStopVm(vm.getId(), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); // Handle highly available VMs diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 4c5c56d..301c651 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -463,7 +463,7 @@ } private void removeVmStatlessImages() { - VmPoolHandler.processVmPoolOnStopVm(getVm().getId(), new CommandContext(getExecutionContext(), getLock())); + DownVmsHandler.processVmPoolOnStopVm(getVm().getId(), new CommandContext(getExecutionContext(), getLock())); // setting lock to null in order not to release lock twice setLock(null); setSucceeded(true); 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 d559561..78930fc 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 @@ -145,7 +145,7 @@ ThreadPoolUtil.execute(new Runnable() { @Override public void run() { - VmPoolHandler.processVmPoolOnStopVm(getVm().getId(), + DownVmsHandler.processVmPoolOnStopVm(getVm().getId(), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); } }); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index 73c6a15..69dee37 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -106,7 +106,7 @@ @Override public void processOnVmStop(Guid vmId) { - VmPoolHandler.processVmPoolOnStopVm(vmId, null); + DownVmsHandler.processVmPoolOnStopVm(vmId, null); } @Override -- To view, visit http://gerrit.ovirt.org/28144 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8840b8cba0fcec68936f0f24abc9948568cca0d 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