Daniel Erez has uploaded a new change for review. Change subject: webadmin: clear connection on import SD rollback ......................................................................
webadmin: clear connection on import SD rollback In order to avoid stale connections data in the DB, clear storage connection when an export/iso domain doesn't exist on the specified path (GetExistingStorageDomainList returns an empty list) Change-Id: Ia2e70353494ce97a6c2ae0ad74868c1f502a309c Bug-Url: https://bugzilla.redhat.com/1020812 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 13 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/20725/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 3a2c17f..79d3418 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -1999,6 +1999,7 @@ boolean success = returnVal != null && returnVal.getSucceeded(); if (success) { + storageListModel.fileConnection.setid((String) returnVal.getActionReturnValue()); AsyncDataProvider.getExistingStorageDomainList(new AsyncQuery(storageListModel, new INewAsyncCallback() { @Override @@ -2006,32 +2007,23 @@ StorageListModel storageListModel1 = (StorageListModel) target; ArrayList<StorageDomain> domains = (ArrayList<StorageDomain>) returnValue; - if (domains != null) - { - if (domains.isEmpty()) - { - postImportFileStorage(storageListModel1.context, - false, - storageListModel1.storageModel, - ConstantsManager.getInstance() - .getConstants() - .thereIsNoStorageDomainUnderTheSpecifiedPathMsg()); - } - else - { - storageListModel1.importFileStorageAddDomain(domains); - } + if (domains != null && !domains.isEmpty()) { + storageListModel1.importFileStorageAddDomain(domains); } - else - { + else { + String errorMessage = domains == null ? + ConstantsManager.getInstance().getConstants() + .failedToRetrieveExistingStorageDomainInformationMsg() : + ConstantsManager.getInstance().getConstants() + .thereIsNoStorageDomainUnderTheSpecifiedPathMsg(); + postImportFileStorage(storageListModel1.context, false, storageListModel1.storageModel, - ConstantsManager.getInstance() - .getConstants() - .failedToRetrieveExistingStorageDomainInformationMsg()); - } + errorMessage); + storageListModel1.cleanConnection(storageListModel1.fileConnection, storageListModel1.hostId); + } } }), hostId, -- To view, visit http://gerrit.ovirt.org/20725 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2e70353494ce97a6c2ae0ad74868c1f502a309c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
