[Engine-patches] Change in ovirt-engine[master]: core: Allow attach of Storage Domain when OVF STORE fails

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Allow attach of Storage Domain when OVF STORE fails
......................................................................

core: Allow attach of Storage Domain when OVF STORE fails

Allow to complete the command of attach storage domain even when
RetrieveImageDataVdsCommand fails.

Change-Id: I8b8c572898a07f5d706e2b58c94ce101da6df5ea
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
1 file changed, 18 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/29563/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
index 22bdaf9..311b050 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java
@@ -200,18 +200,24 @@
             Pair<DiskImage, Long> ovfDiskAndSize = 
getLatestOVFDisk(unregisteredDisks);
             DiskImage ovfDisk = ovfDiskAndSize.getFirst();
             if (ovfDisk != null) {
-                VDSReturnValue retrievedByteData =
-                        runVdsCommand(VDSCommandType.RetrieveImageData,
-                                new 
ImageHttpAccessVDSCommandParameters(getVdsId(),
-                                        getParameters().getStoragePoolId(),
-                                        getParameters().getStorageDomainId(),
-                                        ovfDisk.getId(),
-                                        ovfDisk.getImage().getId(),
-                                        ovfDiskAndSize.getSecond()));
-                if (retrievedByteData.getSucceeded()) {
-                    ovfEntitiesFromTar =
-                            OvfUtils.getOvfEntities((byte[]) 
retrievedByteData.getReturnValue(),
-                                    getParameters().getStorageDomainId());
+                try {
+                    VDSReturnValue retrievedByteData = 
runVdsCommand(VDSCommandType.RetrieveImageData,
+                            new ImageHttpAccessVDSCommandParameters(getVdsId(),
+                                    getParameters().getStoragePoolId(),
+                                    getParameters().getStorageDomainId(),
+                                    ovfDisk.getId(),
+                                    ovfDisk.getImage().getId(),
+                                    ovfDiskAndSize.getSecond()));
+
+                    if (retrievedByteData.getSucceeded()) {
+                        ovfEntitiesFromTar =
+                                OvfUtils.getOvfEntities((byte[]) 
retrievedByteData.getReturnValue(),
+                                        getParameters().getStorageDomainId());
+                    }
+                } catch (VdcBLLException e) {
+                    log.errorFormat("Image data could not be retrieved for 
disk id {0} in storage domain id {1}",
+                            ovfDisk.getId(),
+                            getParameters().getStorageDomainId());
                 }
             }
         }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b8c572898a07f5d706e2b58c94ce101da6df5ea
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches