[Engine-patches] Change in ovirt-engine[master]: core : Change CreateAllSnapshotsFromVmCommand to not use pla...

[rnori]

Ravi Nori has uploaded a new change for review.

Change subject: core : Change CreateAllSnapshotsFromVmCommand to not use 
placeholders mechanism
......................................................................

core : Change CreateAllSnapshotsFromVmCommand to not use placeholders mechanism

CreateAllSnapshotsFromVmCommand has been changed not
to insert placeholders for all child commands before
execution by vdsm

Change-Id: Ic6a6bba5d34e49efc06803ae042de9eb92fa3bc2
Signed-off-by: Ravi Nori <rn...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
3 files changed, 6 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/37146/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
index a0639c3..a7b660f 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java
@@ -34,11 +34,6 @@
     }
 
     @Override
-    protected void insertAsyncTaskPlaceHolders() {
-        persistAsyncTaskPlaceHolder(getParameters().getParentCommand());
-    }
-
-    @Override
     protected void executeCommand() {
         setImageGroupId(getParameters().getDiskInfo().getId());
         if (Guid.isNullOrEmpty(getDestinationImageId())) {
@@ -91,7 +86,7 @@
     }
 
     protected boolean processImageInIrs() {
-        Guid taskId = getAsyncTaskId();
+        Guid taskId = 
persistAsyncTaskPlaceHolder(getParameters().getParentCommand());
         VDSReturnValue vdsReturnValue = runVdsCommand(
                         VDSCommandType.CreateImage,
                         new 
CreateImageVDSCommandParameters(getParameters().getStoragePoolId(), 
getParameters()
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
index c691443..e49ba90 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java
@@ -188,15 +188,6 @@
     }
 
     @Override
-    protected void buildChildCommandInfos() {
-        for (DiskImage image : getDisksList()) {
-            addChildCommandInfo(image.getImageId(),
-                    VdcActionType.CreateSnapshot,
-                    buildCreateSnapshotParameters(image));
-        }
-    }
-
-    @Override
     protected void executeVmCommand() {
         Guid createdSnapshotId = getSnapshotDao().getId(getVmId(), 
SnapshotType.ACTIVE);
         getParameters().setSnapshotType(determineSnapshotType());
@@ -260,7 +251,10 @@
 
     private void createSnapshotsForDisks() {
         for (DiskImage image : getDisksList()) {
-            VdcReturnValueBase vdcReturnValue = 
executeChildCommand(image.getImageId());
+            VdcReturnValueBase vdcReturnValue = 
Backend.getInstance().runInternalAction(
+                    VdcActionType.CreateSnapshot,
+                    buildCreateSnapshotParameters(image),
+                    cloneContextAndDetachFromParent());
 
             if (vdcReturnValue.getSucceeded()) {
                 
getTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList());
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
index 5d48427..0f03c42 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java
@@ -42,11 +42,6 @@
     }
 
     @Override
-    protected void insertAsyncTaskPlaceHolders() {
-        persistAsyncTaskPlaceHolder(getParameters().getParentCommand());
-    }
-
-    @Override
     protected void executeCommand() {
         if (canCreateSnapshot()) {
             VDSReturnValue vdsReturnValue = performImageVdsmOperation();
@@ -88,7 +83,7 @@
         VDSReturnValue vdsReturnValue = null;
 
         try {
-            Guid taskId = getAsyncTaskId();
+            Guid taskId = 
persistAsyncTaskPlaceHolder(getParameters().getParentCommand());
 
             vdsReturnValue =
                     runVdsCommand(


-- 
To view, visit http://gerrit.ovirt.org/37146
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6a6bba5d34e49efc06803ae042de9eb92fa3bc2
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