Ravi Nori has uploaded a new change for review. Change subject: core Change HibernateVmCommand to persist all placeholders ......................................................................
core Change HibernateVmCommand to persist all placeholders This patch changes HibernateVmCommand to persist all async task placeholders before executing the command on vdsm. Change-Id: I7d830fb9a4afe943524b06d64e7840436fb6b7e8 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/15443/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index faf3d4c..342f8db 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -40,6 +40,8 @@ @DisableInPrepareMode @NonTransactiveCommandAttribute(forceCompensation = true) public class HibernateVmCommand<T extends HibernateVmParameters> extends VmOperationCommandBase<T> { + protected static final String TASK1_KEY = "SaveImage"; + protected static final String TASK2_KEY = "SaveRAMState"; private boolean isHibernateVdsProblematic = false; /** * Constructor for command creation when compensation is applied on startup @@ -57,6 +59,12 @@ } private Guid _storageDomainId = Guid.Empty; + + @Override + protected void insertAsyncTaskPlaceHolders() { + persistAsyncTaskPlaceHolder(getParameters().getParentCommand(), TASK1_KEY); + persistAsyncTaskPlaceHolder(getParameters().getParentCommand(), TASK2_KEY); + } /* * find a storage domain to store the hibernation volumes @@ -112,7 +120,7 @@ } }); - final Guid taskId1 = persistAsyncTaskPlaceHolder(VdcActionType.HibernateVm); + final Guid taskId1 = getTaskIdForTaskKey(TASK1_KEY); getReturnValue().getAsyncTaskIdList().add(taskId1); Guid image1GroupId = Guid.NewGuid(); @@ -157,7 +165,7 @@ getReturnValue().getVdsmTaskIdList().add(guid1); - Guid taskId2 = persistAsyncTaskPlaceHolder(VdcActionType.HibernateVm); + Guid taskId2 = getTaskIdForTaskKey(TASK2_KEY); getReturnValue().getAsyncTaskIdList().add(taskId2); // second vol should be 10kb -- To view, visit http://gerrit.ovirt.org/15443 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d830fb9a4afe943524b06d64e7840436fb6b7e8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches