Arik Hadas has uploaded a new change for review. Change subject: core: extract parameters initialization from vdsUpEvent ......................................................................
core: extract parameters initialization from vdsUpEvent Change-Id: I54501c64f9b0ff3cd2bb80d457a597d01328b8d5 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java 3 files changed, 41 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/24798/1 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 3b7decf..810297a 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 @@ -184,24 +184,11 @@ // is on List<VmStatic> vmsToMigrate = DbFacade.getInstance().getVmStaticDao().getAllWithFailbackByVds(vds.getId()); - if (vmsToMigrate.size() > 0) { - ArrayList<VdcActionParametersBase> vmToServerParametersList = - new ArrayList<VdcActionParametersBase>(LinqUtils - .foreach(vmsToMigrate, new Function<VmStatic, VdcActionParametersBase>() { - @Override - public VdcActionParametersBase eval(VmStatic vm) { - MigrateVmToServerParameters parameters = - new MigrateVmToServerParameters(false, - vm.getId(), - vds.getId()); - parameters.setShouldBeLogged(false); - return parameters; - } - })); + if (!vmsToMigrate.isEmpty()) { ExecutionContext executionContext = new ExecutionContext(); executionContext.setMonitored(true); Backend.getInstance().runInternalMultipleActions(VdcActionType.MigrateVmToServer, - vmToServerParametersList, + new ArrayList<>(createVmToServerParametersList(vmsToMigrate, vds)), executionContext); } } catch (RuntimeException e) { @@ -213,6 +200,21 @@ return isSucceeded; } + private List<VdcActionParametersBase> createVmToServerParametersList(List<VmStatic> vmsToMigrate, final VDS vds) { + return LinqUtils.foreach(vmsToMigrate, + new Function<VmStatic, VdcActionParametersBase>() { + @Override + public VdcActionParametersBase eval(VmStatic vm) { + MigrateVmToServerParameters parameters = + new MigrateVmToServerParameters(false, + vm.getId(), + vds.getId()); + parameters.setShouldBeLogged(false); + return parameters; + } + }); + } + @Override public void processOnClientIpChange(final VDS vds, final Guid vmId) { final VmDynamic vmDynamic = DbFacade.getInstance().getVmDynamicDao().get(vmId); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java index e0f2fb1..f491220 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java @@ -12,6 +12,9 @@ import org.ovirt.engine.core.vdsbroker.vdsbroker.MigrateBrokerVDSCommand; public class MigrateVDSCommand<P extends MigrateVDSCommandParameters> extends VdsIdVDSCommandBase<P> { + + private static Log log = LogFactory.getLog(MigrateVDSCommand.class); + public MigrateVDSCommand(P parameters) { super(parameters); } @@ -22,7 +25,7 @@ if (_vdsManager != null) { VMStatus retval; MigrateBrokerVDSCommand<MigrateVDSCommandParameters> command = - new MigrateBrokerVDSCommand<MigrateVDSCommandParameters>(parameters); + new MigrateBrokerVDSCommand<>(parameters); command.execute(); VDSReturnValue vdsReturnValue = command.getVDSReturnValue(); @@ -35,7 +38,7 @@ ResourceManager.getInstance().AddAsyncRunningVm(parameters.getVmId()); } else { retval = vm.getStatus(); - log.error("VDS::migrate:: Failed Vm migration"); + log.error("Failed Vm migration"); getVDSReturnValue().setSucceeded(false); getVDSReturnValue().setVdsError(vdsReturnValue.getVdsError()); getVDSReturnValue().setExceptionString(vdsReturnValue.getExceptionString()); @@ -55,6 +58,4 @@ getVDSReturnValue().setSucceeded(false); } } - - private static Log log = LogFactory.getLog(MigrateVDSCommand.class); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java index 3ad43a4..2e06725 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java @@ -10,14 +10,27 @@ import org.ovirt.engine.core.common.vdscommands.MigrateVDSCommandParameters; public class MigrateBrokerVDSCommand<P extends MigrateVDSCommandParameters> extends VdsBrokerCommand<P> { - private Map<String, String> migrationInfo; + + String migMethod; public MigrateBrokerVDSCommand(P parameters) { super(parameters); - String migMethod = VdsProperties.migrationMethodtoString(parameters.getMigrationMethod()); - log.infoFormat("VdsBroker::migrate::Entered (vm_guid='{0}', srcHost='{1}', dstHost='{2}', method='{3}'", - parameters.getVmId().toString(), parameters.getSrcHost(), parameters.getDstHost(), migMethod); - migrationInfo = new HashMap<>(); + migMethod = VdsProperties.migrationMethodtoString(parameters.getMigrationMethod()); + log.infoFormat("Entered (vm_guid='{0}', srcHost='{1}', dstHost='{2}', method='{3}'", + parameters.getVmId().toString(), parameters.getSrcHost(), + parameters.getDstHost(), migMethod); + } + + @Override + protected void executeVdsBrokerCommand() { + status = getBroker().migrate(createMigrationInfo()); + proceedProxyReturnValue(); + } + + private Map<String, String> createMigrationInfo() { + Map<String, String> migrationInfo = new HashMap<>(); + + P parameters = getParameters(); migrationInfo.put(VdsProperties.vm_guid, parameters.getVmId().toString()); migrationInfo.put(VdsProperties.src, String.format("%1$s", parameters.getSrcHost())); migrationInfo.put(VdsProperties.dst, String.format("%1$s", parameters.getDstHost())); @@ -37,11 +50,7 @@ if (parameters.getMigrationDowntime() != 0) { migrationInfo.put(VdsProperties.MIGRATION_DOWNTIME, Integer.toString(parameters.getMigrationDowntime())); } - } - @Override - protected void executeVdsBrokerCommand() { - status = getBroker().migrate(migrationInfo); - proceedProxyReturnValue(); + return migrationInfo; } } -- To view, visit http://gerrit.ovirt.org/24798 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54501c64f9b0ff3cd2bb80d457a597d01328b8d5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
