Arik Hadas has uploaded a new change for review. Change subject: core: clear migrating_to_vds after successful migration ......................................................................
core: clear migrating_to_vds after successful migration We used to clear this field only upon failed migration, now it will be clear after successful migration as well. Change-Id: Icb4c73eba707551259cdfc3ca6cacb7b61ff5594 Bug-Url: https://bugzilla.redhat.com/1112359 Signed-off-by: Arik Hadas <aha...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java M packaging/dbscripts/vms_sp.sql 4 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/29620/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index f21b9f5..233e9a8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -169,6 +169,12 @@ getMaximumMigrationDowntime()); } + @Override + public void runningSucceded() { + super.runningSucceded(); + getVmDynamicDao().clearMigratingToVds(getVmId()); + } + private int getMaximumMigrationDowntime() { if (getVm().getMigrationDowntime() != null) { return getVm().getMigrationDowntime(); 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 b120789..91bb696 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,4 +64,6 @@ * otherwise */ boolean updateConsoleUserWithOptimisticLocking(VmDynamic vm); + + void clearMigratingToVds(Guid id); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java index 755973e..34c8fc2 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java @@ -49,6 +49,14 @@ } @Override + public void clearMigratingToVds(Guid id) { + MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() + .addValue("vm_guid", id); + + getCallsHandler().executeModification("ClearMigratingToVds", parameterSource); + } + + @Override public boolean updateConsoleUserWithOptimisticLocking(VmDynamic vm) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("vm_guid", vm.getId()) diff --git a/packaging/dbscripts/vms_sp.sql b/packaging/dbscripts/vms_sp.sql index 46669b5..bcd6194 100644 --- a/packaging/dbscripts/vms_sp.sql +++ b/packaging/dbscripts/vms_sp.sql @@ -391,6 +391,19 @@ +Create or replace FUNCTION ClearMigratingToVds(v_vm_guid UUID) +RETURNS VOID + AS $procedure$ +BEGIN + UPDATE vm_dynamic + SET + migrating_to_vds = null + WHERE vm_guid = v_vm_guid; +END; $procedure$ +LANGUAGE plpgsql; + + + Create or replace FUNCTION DeleteVmDynamic(v_vm_guid UUID) RETURNS VOID AS $procedure$ -- To view, visit http://gerrit.ovirt.org/29620 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb4c73eba707551259cdfc3ca6cacb7b61ff5594 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
