Arik Hadas has uploaded a new change for review. Change subject: core: minor cleanup in MigrateVDSCommand ......................................................................
core: minor cleanup in MigrateVDSCommand Change-Id: I55b4365d9a71a47b4a72f98bae649a363f43ef03 Bug-Url: https://bugzilla.redhat.com/1118187 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java 1 file changed, 40 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/29892/1 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..924544d 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 @@ -5,6 +5,8 @@ import org.ovirt.engine.core.common.vdscommands.MigrateVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.dao.VmDAO; +import org.ovirt.engine.core.dao.VmDynamicDAO; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -18,42 +20,46 @@ @Override protected void executeVdsIdCommand() { - MigrateVDSCommandParameters parameters = getParameters(); - if (_vdsManager != null) { - VMStatus retval; - MigrateBrokerVDSCommand<MigrateVDSCommandParameters> command = - new MigrateBrokerVDSCommand<MigrateVDSCommandParameters>(parameters); - command.execute(); - VDSReturnValue vdsReturnValue = command.getVDSReturnValue(); - - final VM vm = DbFacade.getInstance().getVmDao().get(parameters.getVmId()); - - if (vdsReturnValue.getSucceeded()) { - retval = VMStatus.MigratingFrom; - ResourceManager.getInstance().InternalSetVmStatus(vm, VMStatus.MigratingFrom); - vm.setMigratingToVds(parameters.getDstVdsId()); - ResourceManager.getInstance().AddAsyncRunningVm(parameters.getVmId()); - } else { - retval = vm.getStatus(); - log.error("VDS::migrate:: Failed Vm migration"); - getVDSReturnValue().setSucceeded(false); - getVDSReturnValue().setVdsError(vdsReturnValue.getVdsError()); - getVDSReturnValue().setExceptionString(vdsReturnValue.getExceptionString()); - getVDSReturnValue().setExceptionObject(vdsReturnValue.getExceptionObject()); - } - - TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { - @Override - public Void runInTransaction() { - DbFacade.getInstance().getVmDynamicDao().update(vm.getDynamicData()); - return null; - } - }); - - getVDSReturnValue().setReturnValue(retval); - } else { + if (_vdsManager == null) { getVDSReturnValue().setSucceeded(false); + return; } + + MigrateBrokerVDSCommand<?> command = new MigrateBrokerVDSCommand<>(getParameters()); + command.execute(); + VDSReturnValue vdsReturnValue = command.getVDSReturnValue(); + + final VM vm = getVmDao().get(getParameters().getVmId()); + + if (vdsReturnValue.getSucceeded()) { + ResourceManager.getInstance().InternalSetVmStatus(vm, VMStatus.MigratingFrom); + vm.setMigratingToVds(getParameters().getDstVdsId()); + ResourceManager.getInstance().AddAsyncRunningVm(getParameters().getVmId()); + getVDSReturnValue().setReturnValue(VMStatus.MigratingFrom); + } else { + log.error("Failed Vm migration"); + getVDSReturnValue().setSucceeded(false); + getVDSReturnValue().setReturnValue(vm.getStatus()); + getVDSReturnValue().setVdsError(vdsReturnValue.getVdsError()); + getVDSReturnValue().setExceptionString(vdsReturnValue.getExceptionString()); + getVDSReturnValue().setExceptionObject(vdsReturnValue.getExceptionObject()); + } + + TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { + @Override + public Void runInTransaction() { + getVmDynamicDAO().update(vm.getDynamicData()); + return null; + } + }); + } + + private VmDynamicDAO getVmDynamicDAO() { + return DbFacade.getInstance().getVmDynamicDao(); + } + + private VmDAO getVmDao() { + return DbFacade.getInstance().getVmDao(); } private static Log log = LogFactory.getLog(MigrateVDSCommand.class); -- To view, visit http://gerrit.ovirt.org/29892 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55b4365d9a71a47b4a72f98bae649a363f43ef03 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4.3 Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
