Ramesh N has uploaded a new change for review. Change subject: gluster: display error message when sync storage device fails ......................................................................
gluster: display error message when sync storage device fails Handle the exceptions properly in StorageDeviceSyncJob so that error in sync storage device will be logged in the audit log when user tries a manual sync from the UI. Change-Id: Ib05b3f0bcaa95fb50440c939f6b07ade9ba8879c Bug-Url: https://bugzilla.redhat.com/1218240 Signed-off-by: Ramesh Nachimuthu <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJob.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java 3 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/40844/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJob.java index 0178fcc..699b2b2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJob.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJob.java @@ -48,7 +48,12 @@ } } - public void refreshStorageDevicesFromServers(List<VDS> upServers) { + public void refreshStorageDevicesFromServer(VDS host) { + List<StorageDevice> storageDevices = getStorageDevicesFromServer(host); + updateStorageDevices(host, storageDevices); + } + + private void refreshStorageDevicesFromServers(List<VDS> upServers) { List<Callable<Pair<VDS, List<StorageDevice>>>> storageDevicesListCalls = new ArrayList<>(); for (final VDS server : upServers) { @@ -86,7 +91,7 @@ } catch (Exception e) { log.error("Exception retriving storage device from vds {}", e.getMessage()); log.debug("Exception", e); - return null; + throw e; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java index 07d549a..c4da4d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.bll.gluster; -import java.util.Arrays; - import org.ovirt.engine.core.bll.VdsCommand; import org.ovirt.engine.core.bll.VdsValidator; import org.ovirt.engine.core.common.AuditLogType; @@ -40,8 +38,12 @@ @Override protected void executeCommand() { - getStorageDeviceSyncJobInstance().refreshStorageDevicesFromServers(Arrays.asList(getVds())); - setSucceeded(true); + try { + getStorageDeviceSyncJobInstance().refreshStorageDevicesFromServer(getVds()); + setSucceeded(true); + } catch (Exception exp) { + setSucceeded(false); + } } private StorageDeviceSyncJob getStorageDeviceSyncJobInstance() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java index d8e3242..0f001d8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java @@ -162,7 +162,11 @@ private void syncStorageDevices() { Frontend.getInstance() - .runAction(VdcActionType.SyncStorageDevices, new VdsActionParameters(getEntity().getId())); + .runAction(VdcActionType.SyncStorageDevices, + new VdsActionParameters(getEntity().getId()), + null, + true, + true); } @Override -- To view, visit https://gerrit.ovirt.org/40844 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib05b3f0bcaa95fb50440c939f6b07ade9ba8879c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ramesh N <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
