Tal Nisan has uploaded a new change for review. Change subject: core: Import domain fails with SQL constraint violation exception ......................................................................
core: Import domain fails with SQL constraint violation exception Change-Id: Ibf734bf1c9b32b16f2249bc1b0fd94b431d46110 Bug-Url: https://bugzilla.redhat.com/1176430 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/36326/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java index d7df50b..9ec5347 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java @@ -39,6 +39,7 @@ @Override protected void executeCommand() { + updateStorageDomainWipeAfterDelete(); // Add StorageDomain object to DB and update statistics addStorageDomainInDb(); updateStorageDomainDynamicFromIrs(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java index d3a0f98..edf0559 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java @@ -35,6 +35,7 @@ @Override protected void executeCommand() { + updateStorageDomainWipeAfterDelete(); if (StringUtils.isEmpty(getStorageDomain().getStorage())) { getStorageDomain().setStorage( (String) Backend diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java index a34eeef..b3aa5af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java @@ -49,6 +49,10 @@ protected void initializeStorageDomain() { getStorageDomain().setId(Guid.newGuid()); + updateStorageDomainWipeAfterDelete(); + } + + protected void updateStorageDomainWipeAfterDelete() { if(getStorageDomain().getStorageStaticData().getWipeAfterDelete() == null) { getStorageDomain().getStorageStaticData().setWipeAfterDelete( WipeAfterDeleteUtils.getDefaultWipeAfterDeleteFlag( -- To view, visit http://gerrit.ovirt.org/36326 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf734bf1c9b32b16f2249bc1b0fd94b431d46110 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
