Federico Simoncelli has uploaded a new change for review. Change subject: core: avoid adding ovf store when register disk fails ......................................................................
core: avoid adding ovf store when register disk fails Trying to add an ovf store when the disk registration failed it will result in a low level sql error: ERROR: insert or update on table "storage_domains_ovf_info" violates foreign key constraint "storage_domains_ovf_info_ovf_disk_id_fkey" Change-Id: I947a04e14305cd96afa8c455391f2084856d1fc5 Signed-off-by: Federico Simoncelli <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/33356/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 9a57721..e892f46 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 @@ -261,15 +261,21 @@ ovfStoreDiskImage.setShareable(true); RegisterDiskParameters registerDiskParams = new RegisterDiskParameters(ovfStoreDiskImage, getParameters().getStorageDomainId()); - String result = "succeeded"; - if (!runInternalAction(VdcActionType.RegisterDisk, registerDiskParams, cloneContext()).getSucceeded()) { - result = "failed"; - } + + boolean registerDiskResult = runInternalAction(VdcActionType.RegisterDisk, registerDiskParams, + cloneContext()).getSucceeded(); + log.infoFormat("Register new floating OVF_STORE disk with disk id {0} for storage domain {1} has {2}", ovfStoreDiskImage.getId(), getParameters().getStorageDomainId(), - result); - addOvfStoreDiskToDomain(ovfStoreDiskImage); + registerDiskResult ? "succeeded" : "failed"); + + if (registerDiskResult) { + log.infoFormat("Adding OVF_STORE disk with disk id {0} to storage domain {1}", + ovfStoreDiskImage.getId(), + getParameters().getStorageDomainId()); + addOvfStoreDiskToDomain(ovfStoreDiskImage); + } } } -- To view, visit http://gerrit.ovirt.org/33356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I947a04e14305cd96afa8c455391f2084856d1fc5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
