You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2019/05/29 11:19:21 UTC
[geode] branch develop updated: GEODE-6815 Adds member count to
gfsh list members (#3637)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 8bc775e GEODE-6815 Adds member count to gfsh list members (#3637)
8bc775e is described below
commit 8bc775ebdaca8dded552e507dc4611c33a4e6822
Author: jackw26 <ja...@datachat.ai>
AuthorDate: Wed May 29 04:19:09 2019 -0700
GEODE-6815 Adds member count to gfsh list members (#3637)
---
.../internal/cli/commands/ListMembersCommandDUnitTest.java | 6 +++++-
.../geode/management/internal/cli/commands/ListMembersCommand.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
index 6c8559b..6dafdc8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
@@ -71,6 +71,7 @@ public class ListMembersCommandDUnitTest {
@Test
public void listAllMembers() {
gfsh.executeAndAssertThat(LIST_MEMBER).statusIsSuccess()
+ .containsOutput("Member Count : 5")
.hasTableSection(ListMembersCommand.MEMBERS_SECTION).hasColumn("Name")
.containsExactlyInAnyOrder("locator-0", "locator-1", "server-2", "server-3", "server-4");
@@ -82,6 +83,7 @@ public class ListMembersCommandDUnitTest {
gfsh.executeAndAssertThat(LIST_MEMBER + " --group=locatorGroup").statusIsSuccess();
String output = gfsh.getGfshOutput();
+ assertThat(output).contains("Member Count : 2");
assertThat(output).contains("locator-0");
assertThat(output).doesNotContain("server-1");
assertThat(output).doesNotContain("server-2");
@@ -93,6 +95,7 @@ public class ListMembersCommandDUnitTest {
public void listMembersInServerGroupOne() {
gfsh.executeAndAssertThat(LIST_MEMBER + " --group=serverGroup1").statusIsSuccess();
String output = gfsh.getGfshOutput();
+ assertThat(output).contains("Member Count : 2");
assertThat(output).contains("server-2");
assertThat(output).contains("server-3");
assertThat(output).doesNotContain("server-4");
@@ -102,7 +105,7 @@ public class ListMembersCommandDUnitTest {
public void listMembersInServerGroupTwo() {
gfsh.executeAndAssertThat(LIST_MEMBER + " --group=serverGroup2").statusIsSuccess();
String output = gfsh.getGfshOutput();
-
+ assertThat(output).contains("Member Count : 1");
assertThat(output).doesNotContain("server-2");
assertThat(output).doesNotContain("server-3");
assertThat(output).contains("server-4");
@@ -113,6 +116,7 @@ public class ListMembersCommandDUnitTest {
gfsh.executeAndAssertThat(LIST_MEMBER + " --group=foo")
.statusIsSuccess()
.containsOutput("No Members Found")
+ .doesNotContainOutput(("Member Count :"))
.doesNotContainOutput("locator-0", "server-1", "server-2", "server-3");
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java
index 5ee455d..4cf310f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java
@@ -53,7 +53,7 @@ public class ListMembersCommand extends GfshCommand {
crm.addInfo().addLine(CliStrings.LIST_MEMBER__MSG__NO_MEMBER_FOUND);
return crm;
}
-
+ crm.addInfo().addLine("Member Count : " + memberSet.size());
TabularResultModel resultData = crm.addTable(MEMBERS_SECTION);
final String coordinatorMemberId = getCoordinatorId();
for (DistributedMember member : memberSet) {