[KARAF-2317] Display only up and running nodes in cluster:group-list command and CellarGroupMBean
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1496431 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/ff074d6b Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/ff074d6b Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/ff074d6b Branch: refs/heads/cellar-2.2.x Commit: ff074d6b634f22123d4e7a38247fce61d74a3f0c Parents: d49b6d8 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Tue Jun 25 11:54:42 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Tue Jun 25 11:54:42 2013 +0000 ---------------------------------------------------------------------- .../management/internal/CellarGroupMBeanImpl.java | 7 +++++-- .../apache/karaf/cellar/shell/group/GroupSupport.java | 13 ++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ff074d6b/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java ---------------------------------------------------------------------- diff --git a/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java b/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java index 550b749..cf4bfdf 100644 --- a/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java +++ b/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarGroupMBeanImpl.java @@ -160,8 +160,11 @@ public class CellarGroupMBeanImpl extends StandardMBean implements CellarGroupMB for (Group group : allGroups) { StringBuffer members = new StringBuffer(); for (Node node : group.getNodes()) { - members.append(node.getId()); - members.append(" "); + // display only up and running node in the cluster + if (clusterManager.findNodeById(node.getId()) != null) { + members.append(node.getId()); + members.append(" "); + } } CompositeData data = new CompositeDataSupport(groupType, new String[]{ "name", "members" }, http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ff074d6b/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java b/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java index f52eb8a..f7aca55 100644 --- a/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java +++ b/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java @@ -101,12 +101,15 @@ public abstract class GroupSupport extends ClusterCommandSupport { if (g.getNodes() != null && !g.getNodes().isEmpty()) { String mark = " "; for (Node member : g.getNodes()) { - buffer.append(member.getId()); - if (member.equals(clusterManager.getNode())) { - mark = "*"; - buffer.append(mark); + // display only up and running nodes in the cluster + if (clusterManager.findNodeById(member.getId()) != null) { + buffer.append(member.getId()); + if (member.equals(clusterManager.getNode())) { + mark = "*"; + buffer.append(mark); + } + buffer.append(" "); } - buffer.append(" "); } System.out.println(String.format(OUTPUT_FORMAT, mark, g.getName(), buffer.toString())); } else System.out.println(String.format(OUTPUT_FORMAT, "", g.getName(), ""));
