From 9702f8f6466aa5de4a1511903c9ac18f1c8ad0cb Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Mon, 22 Aug 2011 12:06:42 +0530 Subject: Modified to clear selection using StructuredSelection.EMPTY rather than null --- .../storage/management/console/views/pages/AbstractTableViewerPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java index 91780403..06b9ed95 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java @@ -114,7 +114,7 @@ public abstract class AbstractTableViewerPage extends Composite implements IS @Override public void linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent e) { ((CheckboxTableViewer) tableViewer).setAllChecked(false); - tableViewer.setSelection(null); + tableViewer.setSelection(StructuredSelection.EMPTY); } }); } else { -- cgit From bab630dedb8bb01fca3c1cb4c6c65ee85f4fbc3e Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Mon, 22 Aug 2011 12:40:50 +0530 Subject: Modified method executeCommand to throw ConnectionException if the cached SSH connection is no more valid. --- .../src/com/gluster/storage/management/gateway/utils/SshUtil.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java index d00049de..ed45305d 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java @@ -295,7 +295,12 @@ public class SshUtil { // remove the connection from cache and close it sshConnCache.remove(sshConnection); sshConnection.close(); - throw new GlusterRuntimeException(errMsg, e); + if(e instanceof IllegalStateException) { + // The connection is no more valid. Create and throw a connection exception. + throw new ConnectionException("Couldn't open SSH session on [" + sshConnection.getHostname() + "]!", e); + } else { + throw new GlusterRuntimeException(errMsg, e); + } } finally { if(session != null) { session.close(); -- cgit From 4121d2eb2c524f55efc2c3a0623bfc0acfb78015 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Mon, 22 Aug 2011 15:24:24 +0530 Subject: Modified to install public key on a server only if it is online during cluster registration --- .../storage/management/gateway/services/ClusterService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java index 368b34f5..76c8aca8 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java @@ -58,6 +58,9 @@ public class ClusterService { @Autowired private ServerUtil serverUtil; + + @Autowired + private GlusterServerService glusterServerService; private LRUCache onlineServerCache = new LRUCache(3); @@ -164,7 +167,10 @@ public class ClusterService { for(GlusterServer glusterServer : glusterServers) { String serverName = glusterServer.getName(); - checkAndSetupPublicKey(serverName); + glusterServerService.fetchServerDetails(glusterServer); + if(glusterServer.isOnline()) { + checkAndSetupPublicKey(serverName); + } ServerInfo serverInfo = new ServerInfo(serverName); serverInfo.setCluster(cluster); -- cgit From 5d1e834f5f052421ebf74bb576ccf7339a92f404 Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Mon, 22 Aug 2011 15:45:56 +0530 Subject: Bug 3224 - Disk status is not updated even after refresh - Fix --- .../com/gluster/storage/management/console/views/NavigationView.java | 2 +- .../storage/management/console/views/pages/AbstractDisksPage.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java index 9fd080e8..bb942586 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java @@ -83,7 +83,7 @@ public class NavigationView extends ViewPart implements ISelectionListener { clusterListener = new DefaultClusterListener() { public void modelChanged() { - treeViewer.refresh(); + treeViewer.refresh(true); } @Override diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java index 58712e93..9fefc034 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java @@ -86,7 +86,8 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage Date: Mon, 22 Aug 2011 16:30:13 +0530 Subject: REST API releated changes --- .../storage/management/core/constants/RESTConstants.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java index faddb1c6..3e42b1c0 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java @@ -56,7 +56,7 @@ public class RESTConstants { public static final String TASK_REBALANCE_STATUS = "rebalanceStatus"; public static final String TASK_REBALANCE_STOP = "rebalanceStop"; - public static final String FORM_PARAM_VOLUME_NAME = "name"; + public static final String FORM_PARAM_VOLUME_NAME = "volumeName"; public static final String FORM_PARAM_VOLUME_TYPE = "volumeType"; public static final String FORM_PARAM_TRANSPORT_TYPE = "transportType"; public static final String FORM_PARAM_REPLICA_COUNT = "replicaCount"; @@ -79,9 +79,9 @@ public class RESTConstants { public static final String FORM_PARAM_SOURCE = "source"; public static final String FORM_PARAM_TARGET = "target"; public static final String FORM_PARAM_AUTO_COMMIT = "autoCommit"; - public static final String FORM_PARAM_FIX_LAYOUT = "fix-layout"; - public static final String FORM_PARAM_MIGRATE_DATA = "migrate-data"; - public static final String FORM_PARAM_FORCED_DATA_MIGRATE = "forced-data-migrate"; + public static final String FORM_PARAM_FIX_LAYOUT = "fixLayout"; + public static final String FORM_PARAM_MIGRATE_DATA = "migrateData"; + public static final String FORM_PARAM_FORCED_DATA_MIGRATE = "forcedDataMigrate"; public static final String FORM_PARAM_OLD_PASSWORD = "oldPassword"; public static final String FORM_PARAM_NEW_PASSWORD = "newPassword"; @@ -98,10 +98,10 @@ public class RESTConstants { public static final String QUERY_PARAM_BRICKS = "bricks"; public static final String QUERY_PARAM_LINE_COUNT = "lineCount"; public static final String QUERY_PARAM_VOLUME_NAME = "volumeName"; - public static final String QUERY_PARAM_DELETE_OPTION = "deleteOption"; + public static final String QUERY_PARAM_DELETE_OPTION = "deleteData"; public static final String QUERY_PARAM_LOG_SEVERITY = "severity"; - public static final String QUERY_PARAM_FROM_TIMESTAMP = "fromTimestamp"; - public static final String QUERY_PARAM_TO_TIMESTAMP = "toTimestamp"; + public static final String QUERY_PARAM_FROM_TIMESTAMP = "fromTimeStamp"; + public static final String QUERY_PARAM_TO_TIMESTAMP = "toTimeStamp"; public static final String QUERY_PARAM_DOWNLOAD = "download"; public static final String QUERY_PARAM_SERVER_NAME = "serverName"; public static final String QUERY_PARAM_DETAILS = "details"; -- cgit