You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by dh...@apache.org on 2019/07/22 22:09:22 UTC
[geode] 09/18: Modify acceptance test to specify single region.
This is an automated email from the ASF dual-hosted git repository.
dhemery pushed a commit to branch GEODE-7001-region-entry-count
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1526f8c0aca6ce3c24faf90440912e540010b877
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu Jul 18 09:10:51 2019 -0700
Modify acceptance test to specify single region.
Next step: create 2nd region and make the test pass.
---
.../geode/metrics/RegionEntriesGaugeTest.java | 27 +++++++++++++++-------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/RegionEntriesGaugeTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/RegionEntriesGaugeTest.java
index 0d531ec..28b2dac 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/RegionEntriesGaugeTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/RegionEntriesGaugeTest.java
@@ -146,7 +146,9 @@ public class RegionEntriesGaugeTest {
@Test
public void regionEntriesGaugeShowsCountOfReplicateRegionValuesInServer() {
- createRegion(REPLICATE.name(), "replicateRegion");
+ String regionName = "replicateRegion";
+
+ createRegion(REPLICATE.name(), regionName);
List<String> keys = asList("a", "b", "c", "d", "e", "f", "g", "h");
for (String key : keys) {
@@ -160,8 +162,10 @@ public class RegionEntriesGaugeTest {
assertThat(region.sizeOnServer()).isEqualTo(expectedNumberOfEntries);
String connectToLocatorCommand = "connect --locator=" + locatorString;
- String executeFunctionCommand =
- "execute function --id=" + GetMemberRegionEntriesGaugeFunction.ID;
+ String executeFunctionCommand = String.join(SPACE,
+ "execute function",
+ "--id=" + GetMemberRegionEntriesGaugeFunction.ID,
+ "--arguments=" + regionName);
await().atMost(1, TimeUnit.MINUTES).untilAsserted(() -> {
String output =
@@ -175,7 +179,9 @@ public class RegionEntriesGaugeTest {
@Test
public void regionEntriesGaugeShowsCountOfPartitionedRegionValuesInServer() {
- createRegion(PARTITION.name(), "partitionedRegion");
+ String regionName = "partitionedRegion";
+
+ createRegion(PARTITION.name(), regionName);
List<String> keys = asList("a", "b", "c", "d", "e", "f", "g", "h");
for (String key : keys) {
@@ -189,8 +195,10 @@ public class RegionEntriesGaugeTest {
assertThat(region.sizeOnServer()).isEqualTo(expectedNumberOfEntries);
String connectToLocatorCommand = "connect --locator=" + locatorString;
- String executeFunctionCommand =
- "execute function --id=" + GetMemberRegionEntriesGaugeFunction.ID;
+ String executeFunctionCommand = String.join(SPACE,
+ "execute function",
+ "--id=" + GetMemberRegionEntriesGaugeFunction.ID,
+ "--arguments=" + regionName);
// await().untilAsserted(() -> {
String output =
@@ -215,14 +223,17 @@ public class RegionEntriesGaugeTest {
region = clientCache.<String, String>createClientRegionFactory(PROXY).create(regionName);
}
- public static class GetMemberRegionEntriesGaugeFunction implements Function<Void> {
+ public static class GetMemberRegionEntriesGaugeFunction implements Function<String[]> {
private static final String ID = "GetMemberRegionEntriesGaugeFunction";
@Override
- public void execute(FunctionContext<Void> context) {
+ public void execute(FunctionContext<String[]> context) {
+ String regionName = context.getArguments()[0];
+
Gauge memberRegionEntriesGauge = SimpleMetricsPublishingService.getRegistry()
.find("member.region.entries")
+ .tag("region.name", regionName)
.gauge();
Object result = memberRegionEntriesGauge == null