Arik Hadas has uploaded a new change for review. Change subject: core: move clear stop reason to vds broker ......................................................................
core: move clear stop reason to vds broker On run VM flow we should update the dynamic information of the VM only in CreateVmVDSCommand only. Change-Id: If0ec00eab78462005a81cf854585327852440a05 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAO.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java 3 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/29500/1 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 fe94364..ad756f3 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 @@ -245,8 +245,6 @@ if (status != null && (status.isRunning() || status == VMStatus.RestoringState)) { setSucceeded(true); - getVm().setStopReason(null); - getVmDynamicDao().clearStopReason(this.getVm().getId()); } else { // Try to rerun Vm on different vds no need to log the command because it is // being logged inside the rerun diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAO.java index d7701d0..b120789 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAO.java @@ -64,6 +64,4 @@ * otherwise */ boolean updateConsoleUserWithOptimisticLocking(VmDynamic vm); - - void clearStopReason(Guid vmGuid); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java index ebaf240..43898a0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java @@ -45,6 +45,7 @@ if (command.getVDSReturnValue().getSucceeded()) { saveSetInitializedToDb(vm.getId()); + vm.setStopReason(null); vm.setInitialized(true); vm.setRunOnVds(getVdsId()); if (clearHibernationVolume) { -- To view, visit http://gerrit.ovirt.org/29500 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0ec00eab78462005a81cf854585327852440a05 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
