Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: DC 'hangs' in local SD ......................................................................
webadmin: DC 'hangs' in local SD In new DC, 'Local on Host': -> guide-me enters infinite hour glass Change-Id: I92c117f999faf21148da7da1b1b9904130b40be8 Bug-Url: https://bugzilla.redhat.com/880111 Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/13300/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 6974af5..8e3f04b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -16,6 +16,7 @@ import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.action.VdsGroupOperationParameters; import org.ovirt.engine.core.common.businessentities.ServerCpu; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -26,7 +27,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.queries.SearchParameters; @@ -128,6 +128,7 @@ private ArrayList<StorageDomain> isoStorageDomains; private ArrayList<VDS> allHosts; private VDS localStorageHost; + private boolean noLocalStorageHost; public DataCenterGuideModel() { } @@ -234,15 +235,17 @@ hosts = new ArrayList<VDS>(); } dataCenterGuideModel.allHosts = hosts; - AsyncDataProvider.GetLocalStorageHost(new AsyncQuery(dataCenterGuideModel, new INewAsyncCallback() { @Override public void OnSuccess(Object target, Object returnValue) { DataCenterGuideModel dataCenterGuideModel = (DataCenterGuideModel) target; + if (returnValue != null) { VDS localStorageHost = (VDS) returnValue; - ; dataCenterGuideModel.localStorageHost = localStorageHost; + } else { + noLocalStorageHost = true; + } dataCenterGuideModel.UpdateOptionsLocalFS(); } }), dataCenterGuideModel.getEntity().getname()); @@ -454,7 +457,7 @@ } private void UpdateOptionsLocalFS() { - if (clusters == null || allHosts == null || localStorageHost == null) { + if (clusters == null || allHosts == null || (localStorageHost == null && noLocalStorageHost == false)) { return; } @@ -564,6 +567,7 @@ isoStorageDomains = null; allHosts = null; localStorageHost = null; + noLocalStorageHost = false; } private void AddLocalStorage() -- To view, visit http://gerrit.ovirt.org/13300 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92c117f999faf21148da7da1b1b9904130b40be8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
