[geode] branch support/1.12 updated: GEODE-10164: Revert wording change in rebalance result (#7490)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new fdd5c2c GEODE-10164: Revert wording change in rebalance result (#7490)
fdd5c2c is described below
commit fdd5c2cc3df85911dc84ffe889369adb18eee1f5
Author: Barry Oglesby
AuthorDate: Fri Mar 25 06:02:25 2022 -1000
GEODE-10164: Revert wording change in rebalance result (#7490)
I changed the wording on the rebalance command results with the fix to
support rebalancing subregions. This change caused downstream tests to
fail that were expecting the original wording. This change reverts the
change to the wording back to the original.
(cherry picked from commit 9b2351029a6d24f63cc2b1a20af9112e9ed09997)
(cherry picked from commit 6bf622d597e4763e4430ad3f6f1f6e099e220b29)
(cherry picked from commit 26f52542ae23e9c0353e1182ad5d3dd8b4bf5d79)
---
.../geode/management/internal/cli/commands/RebalanceCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
index 781a7b2..51a3dd7 100644
---
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
+++
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
@@ -172,9 +172,9 @@ public class RebalanceCommand extends GfshCommand {
String headerText;
if (simulate) {
- headerText = "Simulated rebalance of partitioned region";
+ headerText = "Simulated partition regions";
} else {
- headerText = "Rebalanced partitioned region";
+ headerText = "Rebalanced partition regions";
}
for (int i = resultItemCount; i < rstlist.size(); i++) {
headerText = headerText + " " + rstlist.get(i);
[geode] branch support/1.13 updated: GEODE-10164: Revert wording change in rebalance result (#7490)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 26f5254 GEODE-10164: Revert wording change in rebalance result (#7490)
26f5254 is described below
commit 26f52542ae23e9c0353e1182ad5d3dd8b4bf5d79
Author: Barry Oglesby
AuthorDate: Fri Mar 25 06:02:25 2022 -1000
GEODE-10164: Revert wording change in rebalance result (#7490)
I changed the wording on the rebalance command results with the fix to
support rebalancing subregions. This change caused downstream tests to
fail that were expecting the original wording. This change reverts the
change to the wording back to the original.
(cherry picked from commit 9b2351029a6d24f63cc2b1a20af9112e9ed09997)
(cherry picked from commit 6bf622d597e4763e4430ad3f6f1f6e099e220b29)
---
.../geode/management/internal/cli/commands/RebalanceCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
index d15362e..8410976 100644
---
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
+++
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
@@ -180,9 +180,9 @@ public class RebalanceCommand extends GfshCommand {
String headerText;
if (simulate) {
- headerText = "Simulated rebalance of partitioned region";
+ headerText = "Simulated partition regions";
} else {
- headerText = "Rebalanced partitioned region";
+ headerText = "Rebalanced partition regions";
}
for (int i = resultItemCount; i < rstlist.size(); i++) {
headerText = headerText + " " + rstlist.get(i);
[geode] branch support/1.14 updated: GEODE-10164: Revert wording change in rebalance result (#7490)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 6bf622d GEODE-10164: Revert wording change in rebalance result (#7490)
6bf622d is described below
commit 6bf622d597e4763e4430ad3f6f1f6e099e220b29
Author: Barry Oglesby
AuthorDate: Fri Mar 25 06:02:25 2022 -1000
GEODE-10164: Revert wording change in rebalance result (#7490)
I changed the wording on the rebalance command results with the fix to
support rebalancing subregions. This change caused downstream tests to
fail that were expecting the original wording. This change reverts the
change to the wording back to the original.
(cherry picked from commit 9b2351029a6d24f63cc2b1a20af9112e9ed09997)
---
.../geode/management/internal/cli/commands/RebalanceCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
index 442d43c..c1dd8c7 100644
---
a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
+++
b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java
@@ -186,9 +186,9 @@ public class RebalanceCommand extends GfshCommand {
String headerText;
if (simulate) {
- headerText = "Simulated rebalance of partitioned region";
+ headerText = "Simulated partition regions";
} else {
- headerText = "Rebalanced partitioned region";
+ headerText = "Rebalanced partition regions";
}
for (int i = resultItemCount; i < rstlist.size(); i++) {
headerText = headerText + " " + rstlist.get(i);
[geode] branch develop updated (e88d57d -> 9b23510)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e88d57d GEODE-9969: Fix unescaping the region name with underscore (#7320) add 9b23510 GEODE-10164: Revert wording change in rebalance result (#7490) No new revisions were added by this update. Summary of changes: .../geode/management/internal/cli/commands/RebalanceCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] branch support/1.12 updated: GEODE-10103: Retrieve full region path names (#7419)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 2ff0343 GEODE-10103: Retrieve full region path names (#7419)
2ff0343 is described below
commit 2ff0343454216171811275939032e92ae2ce63fd
Author: Barry Oglesby
AuthorDate: Wed Mar 9 07:11:30 2022 -1000
GEODE-10103: Retrieve full region path names (#7419)
* GEODE-10103: Retrieve full region path names
This commit modifies RebalanceOperationPerformer getMemberRegionList
to invoke listAllRegionPaths instead of listNames.
(cherry picked from commit 8610ee70d470a8b30ab067db912bd0ac345d9df0)
(cherry picked from commit d8f5afcecab615113c4326a32e9f56e0dfaa44f6)
(cherry picked from commit 3b4ecd09a685b41e5b5d4df3927dd0e93ad87162)
(cherry picked from commit ef29acb596039472a0f9a1c9b455942fe557d5b9)
---
.../rest/RebalanceManagementDunitTest.java | 10 +-
.../operation/RebalanceOperationPerformer.java | 8 +-
.../RebalanceSubregionDistributedTest.java | 111 +
.../internal/cli/commands/RebalanceCommand.java| 4 +-
4 files changed, 123 insertions(+), 10 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
index ae6e034..cc5c4b6 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.rest;
+import static org.apache.geode.cache.Region.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
@@ -94,7 +95,8 @@ public class RebalanceManagementDunitTest {
.isGreaterThanOrEqualTo(cmr.getOperationStart().getTime());
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(2);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isIn("customers1",
"customers2");
+assertThat(firstRegionSummary.getRegionName()).isIn(SEPARATOR +
"customers1",
+SEPARATOR + "customers2");
}
@Test
@@ -109,7 +111,7 @@ public class RebalanceManagementDunitTest {
RebalanceResult result = cmr.getFutureResult().get();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
@@ -124,7 +126,7 @@ public class RebalanceManagementDunitTest {
RebalanceResult result = cmr.getFutureResult().get();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
@@ -161,7 +163,7 @@ public class RebalanceManagementDunitTest {
RebalanceResult result = cmr.getFutureResult().get();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers1");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers1");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
index e59b46d..d9b1956 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
+++
b/geode-core/src/main/java/org/apache/g
[geode] branch support/1.13 updated: GEODE-10103: Retrieve full region path names (#7419)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new ef29acb GEODE-10103: Retrieve full region path names (#7419)
ef29acb is described below
commit ef29acb596039472a0f9a1c9b455942fe557d5b9
Author: Barry Oglesby
AuthorDate: Wed Mar 9 07:11:30 2022 -1000
GEODE-10103: Retrieve full region path names (#7419)
* GEODE-10103: Retrieve full region path names
This commit modifies RebalanceOperationPerformer getMemberRegionList
to invoke listAllRegionPaths instead of listNames.
(cherry picked from commit 8610ee70d470a8b30ab067db912bd0ac345d9df0)
(cherry picked from commit d8f5afcecab615113c4326a32e9f56e0dfaa44f6)
(cherry picked from commit 3b4ecd09a685b41e5b5d4df3927dd0e93ad87162)
---
.../rest/RebalanceManagementDunitTest.java | 10 +-
.../operation/RebalanceOperationPerformer.java | 8 +-
.../operation/RebalanceOperationPerformerTest.java | 9 +-
.../operation/RestoreRedundancyPerformerTest.java | 2 +-
.../RebalanceSubregionDistributedTest.java | 111 +
.../internal/cli/commands/RebalanceCommand.java| 4 +-
6 files changed, 129 insertions(+), 15 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
index dc7cafb..1b16681 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.rest;
+import static org.apache.geode.cache.Region.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
@@ -99,7 +100,8 @@ public class RebalanceManagementDunitTest {
RebalanceResult result = endResult.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(2);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isIn("customers1",
"customers2");
+assertThat(firstRegionSummary.getRegionName()).isIn(SEPARATOR +
"customers1",
+SEPARATOR + "customers2");
}
@Test
@@ -116,7 +118,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
@@ -136,7 +138,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
@@ -194,7 +196,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers1");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers1");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
index 219d97c..17a48e4 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerf
[geode] branch support/1.14 updated: GEODE-10103: Retrieve full region path names (#7419)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 3b4ecd0 GEODE-10103: Retrieve full region path names (#7419)
3b4ecd0 is described below
commit 3b4ecd09a685b41e5b5d4df3927dd0e93ad87162
Author: Barry Oglesby
AuthorDate: Wed Mar 9 07:11:30 2022 -1000
GEODE-10103: Retrieve full region path names (#7419)
* GEODE-10103: Retrieve full region path names
This commit modifies RebalanceOperationPerformer getMemberRegionList
to invoke listAllRegionPaths instead of listNames.
(cherry picked from commit 8610ee70d470a8b30ab067db912bd0ac345d9df0)
(cherry picked from commit d8f5afcecab615113c4326a32e9f56e0dfaa44f6)
---
.../rest/RebalanceManagementDunitTest.java | 9 +-
.../operation/RebalanceOperationPerformer.java | 8 +-
.../operation/RebalanceOperationPerformerTest.java | 8 +-
.../operation/RestoreRedundancyPerformerTest.java | 2 +-
.../RebalanceSubregionDistributedTest.java | 110 +
.../internal/cli/commands/RebalanceCommand.java| 4 +-
6 files changed, 126 insertions(+), 15 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
index b187a24..d292855 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
@@ -100,7 +100,8 @@ public class RebalanceManagementDunitTest {
RebalanceResult result = endResult.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(2);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isIn("customers1",
"customers2");
+assertThat(firstRegionSummary.getRegionName()).isIn(SEPARATOR +
"customers1",
+SEPARATOR + "customers2");
}
@Test
@@ -117,7 +118,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
@@ -137,7 +138,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
@@ -195,7 +196,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers1");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers1");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
index 21f2d00..26ae3dc 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
@@ -162,7 +162,7 @@ public class RebalanceOperationPerformer
// translate to the return type we want
RebalanceRegionResultImpl result = new RebalanceRegionResultImpl();
- result.setRegionName(regionName.replace(SEPARATOR, ""));
[geode] branch support/1.12 updated: GEODE-9910: Stop embedded locator after failed start (#7393)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new f435ec9 GEODE-9910: Stop embedded locator after failed start (#7393)
f435ec9 is described below
commit f435ec93ab3b8796bed39d3b67729449cb9a8f47
Author: Barry Oglesby
AuthorDate: Mon Mar 7 08:50:19 2022 -1000
GEODE-9910: Stop embedded locator after failed start (#7393)
The start-locator property causes a locator to be started when the
InternalDistributedSystem is initialized. The initialize method creates
the locator and then creates a ClusterDistributionManager. If the
creation of the ClusterDistributionManager failed, the started locator
was not stopped. This change addresses that by stopping the locator if
an exception occurs.
(cherry picked from commit 72665b1ec5c6a6b91d0d6c57e997c23033578c58)
(cherry picked from commit 5a32ec00bdbd949bc473322c3643f3d96165d62d)
(cherry picked from commit 53e2b2e07a6312fa5307265d7e418e65667671cd)
(cherry picked from commit 490900535b1fc1582be63a4eed266e42cb170213)
---
...nalDistributedSystemBuilderIntegrationTest.java | 44 +++-
.../internal/InternalDistributedSystem.java| 48 ++
2 files changed, 84 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
index 5bb5ebe..971859a 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.distributed.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,6 +29,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.distributed.Locator;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.api.MembershipLocator;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.metrics.internal.MetricsService;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
@@ -43,7 +51,9 @@ public class InternalDistributedSystemBuilderIntegrationTest {
@After
public void tearDown() {
-system.disconnect();
+if (system != null) {
+ system.disconnect();
+}
}
@Test
@@ -76,4 +86,36 @@ public class InternalDistributedSystemBuilderIntegrationTest
{
assertThat(system.getSecurityService().getPostProcessor())
.isSameAs(thePostProcessor);
}
+
+ @Test
+ public void buildThatStartsLocatorAndFailsThenStopsLocator() {
+// Create properties the cause the locator to be started
+int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
+Properties configProperties = new Properties();
+configProperties.setProperty(MCAST_PORT, "0");
+configProperties.setProperty(START_LOCATOR, "localhost[" + locatorPort +
"]");
+
+// Create a Builder with the TestClusterDistributionManagerConstructor
+InternalDistributedSystem.Builder builder =
+new InternalDistributedSystem.Builder(configProperties,
metricsSessionBuilder)
+.setClusterDistributionManagerConstructor(
+new TestClusterDistributionManagerConstructor());
+
+// Assert that attempting to build the InternalDistributedSystem throws the
+// SystemConnectException
+
assertThatExceptionOfType(SystemConnectException.class).isThrownBy(builder::build);
+
+// Assert that no locator exists after the build attempt
+assertThat(Locator.getLocator()).isNull();
+ }
+
+ static class TestClusterDistributionManagerConstructor implements
+ InternalDistributedSystem.ClusterDistributionManagerConstructor {
+
+@Override
+public ClusterDistributionManager create(InternalDistributedSystem system,
+MembershipLocator membershipLocator) {
+ throw new SystemConnect
[geode] branch support/1.13 updated: GEODE-9910: Stop embedded locator after failed start (#7393)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 732b735 GEODE-9910: Stop embedded locator after failed start (#7393)
732b735 is described below
commit 732b735c1229ffda1e9d30f9cd23ccf6db34a999
Author: Barry Oglesby
AuthorDate: Mon Mar 7 08:50:19 2022 -1000
GEODE-9910: Stop embedded locator after failed start (#7393)
The start-locator property causes a locator to be started when the
InternalDistributedSystem is initialized. The initialize method creates
the locator and then creates a ClusterDistributionManager. If the
creation of the ClusterDistributionManager failed, the started locator
was not stopped. This change addresses that by stopping the locator if
an exception occurs.
(cherry picked from commit 72665b1ec5c6a6b91d0d6c57e997c23033578c58)
(cherry picked from commit 5a32ec00bdbd949bc473322c3643f3d96165d62d)
(cherry picked from commit 53e2b2e07a6312fa5307265d7e418e65667671cd)
---
...nalDistributedSystemBuilderIntegrationTest.java | 44 +++-
.../internal/InternalDistributedSystem.java| 48 ++
2 files changed, 84 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
index 5bb5ebe..971859a 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.distributed.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,6 +29,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.distributed.Locator;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.api.MembershipLocator;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.metrics.internal.MetricsService;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
@@ -43,7 +51,9 @@ public class InternalDistributedSystemBuilderIntegrationTest {
@After
public void tearDown() {
-system.disconnect();
+if (system != null) {
+ system.disconnect();
+}
}
@Test
@@ -76,4 +86,36 @@ public class InternalDistributedSystemBuilderIntegrationTest
{
assertThat(system.getSecurityService().getPostProcessor())
.isSameAs(thePostProcessor);
}
+
+ @Test
+ public void buildThatStartsLocatorAndFailsThenStopsLocator() {
+// Create properties the cause the locator to be started
+int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
+Properties configProperties = new Properties();
+configProperties.setProperty(MCAST_PORT, "0");
+configProperties.setProperty(START_LOCATOR, "localhost[" + locatorPort +
"]");
+
+// Create a Builder with the TestClusterDistributionManagerConstructor
+InternalDistributedSystem.Builder builder =
+new InternalDistributedSystem.Builder(configProperties,
metricsSessionBuilder)
+.setClusterDistributionManagerConstructor(
+new TestClusterDistributionManagerConstructor());
+
+// Assert that attempting to build the InternalDistributedSystem throws the
+// SystemConnectException
+
assertThatExceptionOfType(SystemConnectException.class).isThrownBy(builder::build);
+
+// Assert that no locator exists after the build attempt
+assertThat(Locator.getLocator()).isNull();
+ }
+
+ static class TestClusterDistributionManagerConstructor implements
+ InternalDistributedSystem.ClusterDistributionManagerConstructor {
+
+@Override
+public ClusterDistributionManager create(InternalDistributedSystem system,
+MembershipLocator membershipLocator) {
+ throw new SystemConnectException("Problem starting up membership
services");
+}
+ }
}
di
[geode] branch support/1.14 updated: GEODE-9910: Stop embedded locator after failed start (#7393)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new dd665e9 GEODE-9910: Stop embedded locator after failed start (#7393)
dd665e9 is described below
commit dd665e9699960facea5ce62215359165d175648c
Author: Barry Oglesby
AuthorDate: Mon Mar 7 08:50:19 2022 -1000
GEODE-9910: Stop embedded locator after failed start (#7393)
The start-locator property causes a locator to be started when the
InternalDistributedSystem is initialized. The initialize method creates
the locator and then creates a ClusterDistributionManager. If the
creation of the ClusterDistributionManager failed, the started locator
was not stopped. This change addresses that by stopping the locator if
an exception occurs.
(cherry picked from commit 72665b1ec5c6a6b91d0d6c57e997c23033578c58)
(cherry picked from commit 5a32ec00bdbd949bc473322c3643f3d96165d62d)
---
...nalDistributedSystemBuilderIntegrationTest.java | 44 +++-
.../internal/InternalDistributedSystem.java| 48 ++
2 files changed, 84 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
index 5bb5ebe..971859a 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.distributed.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,6 +29,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.distributed.Locator;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.api.MembershipLocator;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.metrics.internal.MetricsService;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
@@ -43,7 +51,9 @@ public class InternalDistributedSystemBuilderIntegrationTest {
@After
public void tearDown() {
-system.disconnect();
+if (system != null) {
+ system.disconnect();
+}
}
@Test
@@ -76,4 +86,36 @@ public class InternalDistributedSystemBuilderIntegrationTest
{
assertThat(system.getSecurityService().getPostProcessor())
.isSameAs(thePostProcessor);
}
+
+ @Test
+ public void buildThatStartsLocatorAndFailsThenStopsLocator() {
+// Create properties the cause the locator to be started
+int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
+Properties configProperties = new Properties();
+configProperties.setProperty(MCAST_PORT, "0");
+configProperties.setProperty(START_LOCATOR, "localhost[" + locatorPort +
"]");
+
+// Create a Builder with the TestClusterDistributionManagerConstructor
+InternalDistributedSystem.Builder builder =
+new InternalDistributedSystem.Builder(configProperties,
metricsSessionBuilder)
+.setClusterDistributionManagerConstructor(
+new TestClusterDistributionManagerConstructor());
+
+// Assert that attempting to build the InternalDistributedSystem throws the
+// SystemConnectException
+
assertThatExceptionOfType(SystemConnectException.class).isThrownBy(builder::build);
+
+// Assert that no locator exists after the build attempt
+assertThat(Locator.getLocator()).isNull();
+ }
+
+ static class TestClusterDistributionManagerConstructor implements
+ InternalDistributedSystem.ClusterDistributionManagerConstructor {
+
+@Override
+public ClusterDistributionManager create(InternalDistributedSystem system,
+MembershipLocator membershipLocator) {
+ throw new SystemConnectException("Problem starting up membership
services");
+}
+ }
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/int
[geode] branch support/1.15 updated: GEODE-10103: Retrieve full region path names (#7419)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new d8f5afc GEODE-10103: Retrieve full region path names (#7419)
d8f5afc is described below
commit d8f5afcecab615113c4326a32e9f56e0dfaa44f6
Author: Barry Oglesby
AuthorDate: Wed Mar 9 07:11:30 2022 -1000
GEODE-10103: Retrieve full region path names (#7419)
* GEODE-10103: Retrieve full region path names
This commit modifies RebalanceOperationPerformer getMemberRegionList
to invoke listAllRegionPaths instead of listNames.
(cherry picked from commit 8610ee70d470a8b30ab067db912bd0ac345d9df0)
---
.../rest/RebalanceManagementDunitTest.java | 9 +-
.../operation/RebalanceOperationPerformer.java | 8 +-
.../operation/RebalanceOperationPerformerTest.java | 8 +-
.../operation/RestoreRedundancyPerformerTest.java | 2 +-
.../RebalanceSubregionDistributedTest.java | 110 +
.../internal/cli/commands/RebalanceCommand.java| 4 +-
6 files changed, 126 insertions(+), 15 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
index 5808b7e..fdfff56 100644
---
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
@@ -100,7 +100,8 @@ public class RebalanceManagementDunitTest {
RebalanceResult result = endResult.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(2);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isIn("customers1",
"customers2");
+assertThat(firstRegionSummary.getRegionName()).isIn(SEPARATOR +
"customers1",
+SEPARATOR + "customers2");
}
@Test
@@ -117,7 +118,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
@@ -137,7 +138,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers2");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers2");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
@@ -195,7 +196,7 @@ public class RebalanceManagementDunitTest {
.getOperationResult();
assertThat(result.getRebalanceRegionResults().size()).isEqualTo(1);
RebalanceRegionResult firstRegionSummary =
result.getRebalanceRegionResults().get(0);
-assertThat(firstRegionSummary.getRegionName()).isEqualTo("customers1");
+assertThat(firstRegionSummary.getRegionName()).isEqualTo(SEPARATOR +
"customers1");
assertThat(firstRegionSummary.getBucketCreateBytes()).isEqualTo(0);
assertThat(firstRegionSummary.getTimeInMilliseconds()).isGreaterThanOrEqualTo(0);
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
index 21f2d00..26ae3dc 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/operation/RebalanceOperationPerformer.java
@@ -162,7 +162,7 @@ public class RebalanceOperationPerformer
// translate to the return type we want
RebalanceRegionResultImpl result = new RebalanceRegionResultImpl();
- result.setRegionName(regionName.replace(SEPARATOR, ""));
+ result.setRegionName(regionName);
result.setBucketCreateBytes(results.g
[geode] branch develop updated (9c701fc -> 8610ee7)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 9c701fc GEODE-10066: Disable test until flakiness is resolved. (#7433) add 8610ee7 GEODE-10103: Retrieve full region path names (#7419) No new revisions were added by this update. Summary of changes: .../rest/RebalanceManagementDunitTest.java | 9 +- .../operation/RebalanceOperationPerformer.java | 8 +- .../operation/RebalanceOperationPerformerTest.java | 8 +- .../operation/RestoreRedundancyPerformerTest.java | 2 +- .../RebalanceSubregionDistributedTest.java | 110 + .../internal/cli/commands/RebalanceCommand.java| 4 +- 6 files changed, 126 insertions(+), 15 deletions(-) create mode 100644 geode-gfsh/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceSubregionDistributedTest.java
[geode] branch support/1.15 updated: GEODE-9910: Stop embedded locator after failed start (#7393)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new 5a32ec0 GEODE-9910: Stop embedded locator after failed start (#7393)
5a32ec0 is described below
commit 5a32ec00bdbd949bc473322c3643f3d96165d62d
Author: Barry Oglesby
AuthorDate: Mon Mar 7 08:50:19 2022 -1000
GEODE-9910: Stop embedded locator after failed start (#7393)
The start-locator property causes a locator to be started when the
InternalDistributedSystem is initialized. The initialize method creates
the locator and then creates a ClusterDistributionManager. If the
creation of the ClusterDistributionManager failed, the started locator
was not stopped. This change addresses that by stopping the locator if
an exception occurs.
(cherry picked from commit 72665b1ec5c6a6b91d0d6c57e997c23033578c58)
---
...nalDistributedSystemBuilderIntegrationTest.java | 44 +++-
.../internal/InternalDistributedSystem.java| 48 ++
2 files changed, 84 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
index 5bb5ebe..971859a 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemBuilderIntegrationTest.java
@@ -14,8 +14,11 @@
*/
package org.apache.geode.distributed.internal;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static
org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,6 +29,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.distributed.Locator;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.api.MembershipLocator;
+import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.metrics.internal.MetricsService;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
@@ -43,7 +51,9 @@ public class InternalDistributedSystemBuilderIntegrationTest {
@After
public void tearDown() {
-system.disconnect();
+if (system != null) {
+ system.disconnect();
+}
}
@Test
@@ -76,4 +86,36 @@ public class InternalDistributedSystemBuilderIntegrationTest
{
assertThat(system.getSecurityService().getPostProcessor())
.isSameAs(thePostProcessor);
}
+
+ @Test
+ public void buildThatStartsLocatorAndFailsThenStopsLocator() {
+// Create properties the cause the locator to be started
+int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
+Properties configProperties = new Properties();
+configProperties.setProperty(MCAST_PORT, "0");
+configProperties.setProperty(START_LOCATOR, "localhost[" + locatorPort +
"]");
+
+// Create a Builder with the TestClusterDistributionManagerConstructor
+InternalDistributedSystem.Builder builder =
+new InternalDistributedSystem.Builder(configProperties,
metricsSessionBuilder)
+.setClusterDistributionManagerConstructor(
+new TestClusterDistributionManagerConstructor());
+
+// Assert that attempting to build the InternalDistributedSystem throws the
+// SystemConnectException
+
assertThatExceptionOfType(SystemConnectException.class).isThrownBy(builder::build);
+
+// Assert that no locator exists after the build attempt
+assertThat(Locator.getLocator()).isNull();
+ }
+
+ static class TestClusterDistributionManagerConstructor implements
+ InternalDistributedSystem.ClusterDistributionManagerConstructor {
+
+@Override
+public ClusterDistributionManager create(InternalDistributedSystem system,
+MembershipLocator membershipLocator) {
+ throw new SystemConnectException("Problem starting up membership
services");
+}
+ }
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
b/geode-core/src/main/ja
[geode] branch develop updated (2cd5d82 -> 72665b1)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 2cd5d82 GEODE-9950: Add Radish LRANGE command (#7389) add 72665b1 GEODE-9910: Stop embedded locator after failed start (#7393) No new revisions were added by this update. Summary of changes: ...nalDistributedSystemBuilderIntegrationTest.java | 44 +++- .../internal/InternalDistributedSystem.java| 48 ++ 2 files changed, 84 insertions(+), 8 deletions(-)
[geode] branch support/1.15 updated: GEODE-10009: Invoked internalClose with keepAlive true (#7332)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new 05eba09 GEODE-10009: Invoked internalClose with keepAlive true (#7332)
05eba09 is described below
commit 05eba09d0f3881344b130dca226f5e8203d546d2
Author: Barry Oglesby
AuthorDate: Mon Feb 7 15:03:51 2022 -1000
GEODE-10009: Invoked internalClose with keepAlive true (#7332)
(cherry picked from commit 551d7d78548f10218146b074df9b0c4adc0940f7)
---
.../client/internal/QueueManagerJUnitTest.java | 28 +++---
.../cache/client/internal/QueueManagerImpl.java| 2 +-
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index e2f8569..dbdd123 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -275,6 +275,25 @@ public class QueueManagerJUnitTest {
.hasMessageContaining(serverRefusedConnectionExceptionMessage);
}
+ @Test
+ public void
testAddToConnectionListCallsCloseConnectionOpWithKeepAliveTrue2() {
+// Create a DummyConnection
+DummyConnection connection = factory.addConnection(0, 0, 1);
+assertThat(connection.keepAlive).isFalse();
+
+// Get and close its Endpoint
+Endpoint endpoint = connection.getEndpoint();
+endpoint.close();
+
+// Create and start a QueueManagerImpl
+manager = new QueueManagerImpl(pool, endpoints, source, factory, 2, 20,
logger,
+ClientProxyMembershipID.getNewProxyMembership(ds));
+manager.start(background);
+
+// Assert that the connection keepAlive is true
+assertThat(connection.keepAlive).isTrue();
+ }
+
private static void assertPortEquals(int expected, Connection actual) {
assertThat(actual.getServer().getPort()).isEqualTo(expected);
}
@@ -596,8 +615,10 @@ public class QueueManagerJUnitTest {
nextConnections.add(null);
}
-private void addConnection(int endpointType, int queueSize, int port) {
- nextConnections.add(new DummyConnection(endpointType, queueSize, port));
+private DummyConnection addConnection(int endpointType, int queueSize, int
port) {
+ DummyConnection connection = new DummyConnection(endpointType,
queueSize, port);
+ nextConnections.add(connection);
+ return connection;
}
@Override
@@ -720,6 +741,7 @@ public class QueueManagerJUnitTest {
private final ServerQueueStatus status;
private final ServerLocation location;
private final Endpoint endpoint;
+private boolean keepAlive;
private DummyConnection(int endpointType, int queueSize, int port) {
InternalDistributedMember member = new
InternalDistributedMember("localhost", 555);
@@ -730,7 +752,7 @@ public class QueueManagerJUnitTest {
@Override
public void close(boolean keepAlive) {
- // nothing
+ this.keepAlive = keepAlive;
}
@Override
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
index 2afddb8..28485c7 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
@@ -1010,7 +1010,7 @@ public class QueueManagerImpl implements QueueManager {
connection.getEndpoint());
}
try {
-connection.internalClose(pool.getKeepAlive());
+connection.internalClose(true);
} catch (Exception e) {
if (logger.isDebugEnabled()) {
logger.debug("Error destroying client to server connection to {}",
[geode] branch develop updated (e7094ee -> 551d7d7)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e7094ee GEODE-9985: add region redundancy to avoid data loss. (#7308) add 551d7d7 GEODE-10009: Invoked internalClose with keepAlive true (#7332) No new revisions were added by this update. Summary of changes: .../client/internal/QueueManagerJUnitTest.java | 28 +++--- .../cache/client/internal/QueueManagerImpl.java| 2 +- 2 files changed, 26 insertions(+), 4 deletions(-)
[geode] branch support/1.12 updated: GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 16ecb01 GEODE-9372: Added createSenderTime and createSenderInProgress
stats (#6608)
16ecb01 is described below
commit 16ecb0121d98723a19dcb8d082ec1c41fcaf2f85
Author: Barry Oglesby
AuthorDate: Mon Jun 14 08:30:44 2021 -1000
GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608)
(cherry picked from commit f0e6e0d9c2b299e31fd20dea47703b019fc66f31)
(cherry picked from commit 5644b85c65e136d65cfe92f8dd3888a148cd925c)
(cherry picked from commit aa106eee0d33767d57279855873d592b73b19fc7)
---
.../apache/geode/distributed/internal/DMStats.java | 3 ++-
.../distributed/internal/DistributionStats.java| 23 +-
.../internal/LonerDistributionManager.java | 7 ++-
.../apache/geode/internal/tcp/ConnectionTable.java | 6 --
.../internal/DistributionStatsTest.java| 16 ---
5 files changed, 47 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
index 0f880b2..a2c9532 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
@@ -263,7 +263,7 @@ public interface DMStats extends MembershipStatistics {
/**
* @since GemFire 4.1
*/
- void incSenders(boolean shared, boolean preserveOrder);
+ void incSenders(boolean shared, boolean preserveOrder, long start);
/**
* @since GemFire 4.1
@@ -560,4 +560,5 @@ public interface DMStats extends MembershipStatistics {
long getUdpFinalCheckResponsesReceived();
+ long startSenderCreate();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
index b08a512..e4fdaf55 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
@@ -112,6 +112,8 @@ public class DistributionStats implements DMStats {
private static final int sharedUnorderedSenderConnectionsId;
private static final int threadOrderedSenderConnectionsId;
private static final int threadUnorderedSenderConnectionsId;
+ static final int senderCreateTimeId;
+ static final int senderCreatesInProgressId;
private static final int syncSocketWritesInProgressId;
private static final int syncSocketWriteTimeId;
@@ -443,6 +445,11 @@ public class DistributionStats implements DMStats {
final String udpFinalCheckResponsesReceivedDesc =
"UDP final check responses that this member has received.";
+final String senderCreatesDesc =
+"Total amount of time, in nanoseconds, spent creating a sender.";
+final String senderCreatesInProgressDesc =
+"Current number of sender creations in progress.";
+
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
type = f.createType(statName, statDescription, new StatisticDescriptor[] {
@@ -515,6 +522,8 @@ public class DistributionStats implements DMStats {
f.createIntCounter("failedConnects", failedConnectsDesc, "connects"),
f.createIntCounter("reconnectAttempts", reconnectAttemptsDesc,
"connects"),
f.createIntCounter("senderTimeouts", lostConnectionLeaseDesc,
"expirations"),
+f.createLongCounter("senderCreateTime", senderCreatesDesc,
"nanoseconds"),
+f.createLongGauge("senderCreatesInProgress",
senderCreatesInProgressDesc, "operations"),
f.createIntGauge("syncSocketWritesInProgress",
"Current number of synchronous/blocking socket write calls in
progress.", "writes"),
@@ -796,6 +805,8 @@ public class DistributionStats implements DMStats {
sharedUnorderedSenderConnectionsId = type.nameToId("sendersSU");
threadOrderedSenderConnectionsId = type.nameToId("sendersTO");
threadUnorderedSenderConnectionsId = type.nameToId("sendersTU");
+senderCreateTimeId = type.nameToId("senderCreateTime");
+senderCreatesInProgressId = type.nameToId("senderCreatesInProgress");
syncSocketWritesInProgressId = type.nameToId("syncSocketWritesInProgress");
syncSocketWriteTimeId = type.nameToId("syncSocketWriteTime");
@@ -1658,7 +1669,13 @@ public class DistributionStats implements DMStats {
}
@Override
[geode] branch support/1.13 updated: GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new aa106ee GEODE-9372: Added createSenderTime and createSenderInProgress
stats (#6608)
aa106ee is described below
commit aa106eee0d33767d57279855873d592b73b19fc7
Author: Barry Oglesby
AuthorDate: Mon Jun 14 08:30:44 2021 -1000
GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608)
(cherry picked from commit f0e6e0d9c2b299e31fd20dea47703b019fc66f31)
(cherry picked from commit 5644b85c65e136d65cfe92f8dd3888a148cd925c)
---
.../apache/geode/distributed/internal/DMStats.java | 3 ++-
.../distributed/internal/DistributionStats.java| 23 +-
.../internal/LonerDistributionManager.java | 7 ++-
.../apache/geode/internal/tcp/ConnectionTable.java | 6 --
.../internal/DistributionStatsTest.java| 16 ---
5 files changed, 47 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
index 0f880b2..a2c9532 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
@@ -263,7 +263,7 @@ public interface DMStats extends MembershipStatistics {
/**
* @since GemFire 4.1
*/
- void incSenders(boolean shared, boolean preserveOrder);
+ void incSenders(boolean shared, boolean preserveOrder, long start);
/**
* @since GemFire 4.1
@@ -560,4 +560,5 @@ public interface DMStats extends MembershipStatistics {
long getUdpFinalCheckResponsesReceived();
+ long startSenderCreate();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
index b08a512..e4fdaf55 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
@@ -112,6 +112,8 @@ public class DistributionStats implements DMStats {
private static final int sharedUnorderedSenderConnectionsId;
private static final int threadOrderedSenderConnectionsId;
private static final int threadUnorderedSenderConnectionsId;
+ static final int senderCreateTimeId;
+ static final int senderCreatesInProgressId;
private static final int syncSocketWritesInProgressId;
private static final int syncSocketWriteTimeId;
@@ -443,6 +445,11 @@ public class DistributionStats implements DMStats {
final String udpFinalCheckResponsesReceivedDesc =
"UDP final check responses that this member has received.";
+final String senderCreatesDesc =
+"Total amount of time, in nanoseconds, spent creating a sender.";
+final String senderCreatesInProgressDesc =
+"Current number of sender creations in progress.";
+
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
type = f.createType(statName, statDescription, new StatisticDescriptor[] {
@@ -515,6 +522,8 @@ public class DistributionStats implements DMStats {
f.createIntCounter("failedConnects", failedConnectsDesc, "connects"),
f.createIntCounter("reconnectAttempts", reconnectAttemptsDesc,
"connects"),
f.createIntCounter("senderTimeouts", lostConnectionLeaseDesc,
"expirations"),
+f.createLongCounter("senderCreateTime", senderCreatesDesc,
"nanoseconds"),
+f.createLongGauge("senderCreatesInProgress",
senderCreatesInProgressDesc, "operations"),
f.createIntGauge("syncSocketWritesInProgress",
"Current number of synchronous/blocking socket write calls in
progress.", "writes"),
@@ -796,6 +805,8 @@ public class DistributionStats implements DMStats {
sharedUnorderedSenderConnectionsId = type.nameToId("sendersSU");
threadOrderedSenderConnectionsId = type.nameToId("sendersTO");
threadUnorderedSenderConnectionsId = type.nameToId("sendersTU");
+senderCreateTimeId = type.nameToId("senderCreateTime");
+senderCreatesInProgressId = type.nameToId("senderCreatesInProgress");
syncSocketWritesInProgressId = type.nameToId("syncSocketWritesInProgress");
syncSocketWriteTimeId = type.nameToId("syncSocketWriteTime");
@@ -1658,7 +1669,13 @@ public class DistributionStats implements DMStats {
}
@Override
- public void incSenders(boolean shared, boolean preserveOrder) {
+ publ
[geode] branch support/1.14 updated: GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 5644b85 GEODE-9372: Added createSenderTime and createSenderInProgress
stats (#6608)
5644b85 is described below
commit 5644b85c65e136d65cfe92f8dd3888a148cd925c
Author: Barry Oglesby
AuthorDate: Mon Jun 14 08:30:44 2021 -1000
GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608)
(cherry picked from commit f0e6e0d9c2b299e31fd20dea47703b019fc66f31)
---
.../apache/geode/distributed/internal/DMStats.java | 3 ++-
.../distributed/internal/DistributionStats.java| 23 +-
.../internal/LonerDistributionManager.java | 7 ++-
.../apache/geode/internal/tcp/ConnectionTable.java | 6 --
.../internal/DistributionStatsTest.java| 16 ---
5 files changed, 47 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
index 0f880b2..a2c9532 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
@@ -263,7 +263,7 @@ public interface DMStats extends MembershipStatistics {
/**
* @since GemFire 4.1
*/
- void incSenders(boolean shared, boolean preserveOrder);
+ void incSenders(boolean shared, boolean preserveOrder, long start);
/**
* @since GemFire 4.1
@@ -560,4 +560,5 @@ public interface DMStats extends MembershipStatistics {
long getUdpFinalCheckResponsesReceived();
+ long startSenderCreate();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
index b08a512..e4fdaf55 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
@@ -112,6 +112,8 @@ public class DistributionStats implements DMStats {
private static final int sharedUnorderedSenderConnectionsId;
private static final int threadOrderedSenderConnectionsId;
private static final int threadUnorderedSenderConnectionsId;
+ static final int senderCreateTimeId;
+ static final int senderCreatesInProgressId;
private static final int syncSocketWritesInProgressId;
private static final int syncSocketWriteTimeId;
@@ -443,6 +445,11 @@ public class DistributionStats implements DMStats {
final String udpFinalCheckResponsesReceivedDesc =
"UDP final check responses that this member has received.";
+final String senderCreatesDesc =
+"Total amount of time, in nanoseconds, spent creating a sender.";
+final String senderCreatesInProgressDesc =
+"Current number of sender creations in progress.";
+
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
type = f.createType(statName, statDescription, new StatisticDescriptor[] {
@@ -515,6 +522,8 @@ public class DistributionStats implements DMStats {
f.createIntCounter("failedConnects", failedConnectsDesc, "connects"),
f.createIntCounter("reconnectAttempts", reconnectAttemptsDesc,
"connects"),
f.createIntCounter("senderTimeouts", lostConnectionLeaseDesc,
"expirations"),
+f.createLongCounter("senderCreateTime", senderCreatesDesc,
"nanoseconds"),
+f.createLongGauge("senderCreatesInProgress",
senderCreatesInProgressDesc, "operations"),
f.createIntGauge("syncSocketWritesInProgress",
"Current number of synchronous/blocking socket write calls in
progress.", "writes"),
@@ -796,6 +805,8 @@ public class DistributionStats implements DMStats {
sharedUnorderedSenderConnectionsId = type.nameToId("sendersSU");
threadOrderedSenderConnectionsId = type.nameToId("sendersTO");
threadUnorderedSenderConnectionsId = type.nameToId("sendersTU");
+senderCreateTimeId = type.nameToId("senderCreateTime");
+senderCreatesInProgressId = type.nameToId("senderCreatesInProgress");
syncSocketWritesInProgressId = type.nameToId("syncSocketWritesInProgress");
syncSocketWriteTimeId = type.nameToId("syncSocketWriteTime");
@@ -1658,7 +1669,13 @@ public class DistributionStats implements DMStats {
}
@Override
- public void incSenders(boolean shared, boolean preserveOrder) {
+ public long startSenderCreate() {
+stats.incLong(senderCreatesInProgressI
[geode] branch support/1.12 updated: GEODE-9528: Updated test to await until asserted (#6798)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 1c0 GEODE-9528: Updated test to await until asserted (#6798)
1c0 is described below
commit 1c043ff51a6c5eb77b0a83b10b83e071aad0
Author: Barry Oglesby
AuthorDate: Wed Aug 25 10:38:30 2021 -1000
GEODE-9528: Updated test to await until asserted (#6798)
(cherry picked from commit ed816c55406131b95d4db8571558ed1fcecc53e7)
(cherry picked from commit aecbdb2d327cb4dfdf27e669092c7889414a7e7f)
(cherry picked from commit fa1f753b38c8b8a1985b712751411e94654ca49e)
---
.../distributed/internal/DistributionAdvisorIntegrationTest.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
index e04ddf4..6f88006 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.distributed.internal;
import static
org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
@@ -29,7 +30,8 @@ public class DistributionAdvisorIntegrationTest {
@Rule
// The embedded locator causes a ClusterDistributionManager to be created
rather than a
- // LonerDistributionManager which is necessary for this test
+ // LonerDistributionManager which is necessary for this test. Disabling
auto-reconnect prevents
+ // the DistributedSystem from being recreated and causing issues with
repeatIntegrationTest
public ServerStarterRule server =
new ServerStarterRule().withProperty(DISABLE_AUTO_RECONNECT,
"true").withNoCacheServer()
.withEmbeddedLocator().withAutoStart();
@@ -54,6 +56,7 @@ public class DistributionAdvisorIntegrationTest {
server.forceDisconnectMember();
// Verify the MembershipListener is removed from the DistributionManager
-assertThat(manager.getMembershipListeners().contains(listener)).isFalse();
+await().untilAsserted(
+() ->
assertThat(manager.getMembershipListeners().contains(listener)).isFalse());
}
}
[geode] branch support/1.13 updated: GEODE-9528: Updated test to await until asserted (#6798)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new fa1f753 GEODE-9528: Updated test to await until asserted (#6798)
fa1f753 is described below
commit fa1f753b38c8b8a1985b712751411e94654ca49e
Author: Barry Oglesby
AuthorDate: Wed Aug 25 10:38:30 2021 -1000
GEODE-9528: Updated test to await until asserted (#6798)
(cherry picked from commit ed816c55406131b95d4db8571558ed1fcecc53e7)
(cherry picked from commit aecbdb2d327cb4dfdf27e669092c7889414a7e7f)
---
.../distributed/internal/DistributionAdvisorIntegrationTest.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
index e04ddf4..6f88006 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.distributed.internal;
import static
org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
@@ -29,7 +30,8 @@ public class DistributionAdvisorIntegrationTest {
@Rule
// The embedded locator causes a ClusterDistributionManager to be created
rather than a
- // LonerDistributionManager which is necessary for this test
+ // LonerDistributionManager which is necessary for this test. Disabling
auto-reconnect prevents
+ // the DistributedSystem from being recreated and causing issues with
repeatIntegrationTest
public ServerStarterRule server =
new ServerStarterRule().withProperty(DISABLE_AUTO_RECONNECT,
"true").withNoCacheServer()
.withEmbeddedLocator().withAutoStart();
@@ -54,6 +56,7 @@ public class DistributionAdvisorIntegrationTest {
server.forceDisconnectMember();
// Verify the MembershipListener is removed from the DistributionManager
-assertThat(manager.getMembershipListeners().contains(listener)).isFalse();
+await().untilAsserted(
+() ->
assertThat(manager.getMembershipListeners().contains(listener)).isFalse());
}
}
[geode] branch support/1.14 updated: GEODE-9528: Updated test to await until asserted (#6798)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new aecbdb2 GEODE-9528: Updated test to await until asserted (#6798)
aecbdb2 is described below
commit aecbdb2d327cb4dfdf27e669092c7889414a7e7f
Author: Barry Oglesby
AuthorDate: Wed Aug 25 10:38:30 2021 -1000
GEODE-9528: Updated test to await until asserted (#6798)
(cherry picked from commit ed816c55406131b95d4db8571558ed1fcecc53e7)
---
.../distributed/internal/DistributionAdvisorIntegrationTest.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
index e04ddf4..6f88006 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.distributed.internal;
import static
org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
@@ -29,7 +30,8 @@ public class DistributionAdvisorIntegrationTest {
@Rule
// The embedded locator causes a ClusterDistributionManager to be created
rather than a
- // LonerDistributionManager which is necessary for this test
+ // LonerDistributionManager which is necessary for this test. Disabling
auto-reconnect prevents
+ // the DistributedSystem from being recreated and causing issues with
repeatIntegrationTest
public ServerStarterRule server =
new ServerStarterRule().withProperty(DISABLE_AUTO_RECONNECT,
"true").withNoCacheServer()
.withEmbeddedLocator().withAutoStart();
@@ -54,6 +56,7 @@ public class DistributionAdvisorIntegrationTest {
server.forceDisconnectMember();
// Verify the MembershipListener is removed from the DistributionManager
-assertThat(manager.getMembershipListeners().contains(listener)).isFalse();
+await().untilAsserted(
+() ->
assertThat(manager.getMembershipListeners().contains(listener)).isFalse());
}
}
[geode] branch develop updated (83de8f2 -> cb42855)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 83de8f2 add 1.12.8 to old versions on develop (#7268) add cb42855 GEODE-9913: Added basicBridgePut condition to ensure VersionTag set (#7235) No new revisions were added by this update. Summary of changes: .../apache/geode/internal/cache/LocalRegion.java | 2 + .../geode/internal/cache/LocalRegionTest.java | 47 ++ 2 files changed, 49 insertions(+)
[geode] branch develop updated (99bbf99 -> 20242c6)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 99bbf99 GEODE-9867: do not process the message if the connection is terminated (#7158) add 20242c6 GEODE-9865: Decrement the count if the connection is unsuccessful (#7159) No new revisions were added by this update. Summary of changes: .../client/internal/pooling/ConnectionManagerImplTest.java | 14 ++ .../client/internal/pooling/ConnectionManagerImpl.java | 8 +++- 2 files changed, 21 insertions(+), 1 deletion(-)
[geode] branch develop updated (c9d465b -> ed816c5)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c9d465b GEODE-9369: Command to copy region entries from a WAN site to another (#6601) add ed816c5 GEODE-9528: Updated test to await until asserted (#6798) No new revisions were added by this update. Summary of changes: .../internal/DistributionAdvisorIntegrationTest.java | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-)
[geode] branch develop updated (5936e4f -> f0e6e0d)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 5936e4f GEODE-9373: add testEventIdOutOfOrderInPartitionRegionSingleHopFromCl… (#6609) add f0e6e0d GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608) No new revisions were added by this update. Summary of changes: .../apache/geode/distributed/internal/DMStats.java | 3 ++- .../distributed/internal/DistributionStats.java| 23 +- .../internal/LonerDistributionManager.java | 7 ++- .../apache/geode/internal/tcp/ConnectionTable.java | 6 -- .../internal/DistributionStatsTest.java| 16 --- 5 files changed, 47 insertions(+), 8 deletions(-)
[geode] branch feature/GEODE-9372 created (now 3704125)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9372 in repository https://gitbox.apache.org/repos/asf/geode.git. at 3704125 GEODE-9372: Added createSenderTime and createSenderInProgress stats No new revisions were added by this update.
[geode] branch develop updated (32d7498 -> 0bd4be0)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 32d7498 Revert "GEODE-9248: Server hosting CQ queue uneccessary fills bucketToTempQue… (#6477)" (#6603) add 0bd4be0 GEODE-8825: Modified test to wait for proxies to be created (#6591) No new revisions were added by this update. Summary of changes: .../cache/wan/GatewayReceiverMBeanDUnitTest.java | 39 +- 1 file changed, 23 insertions(+), 16 deletions(-)
[geode] 01/01: GEODE-8825: Modified test to wait for proxies to be created
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8825
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ac61fa8357d108171d2f891761d280d130775ac9
Author: Barry Oglesby
AuthorDate: Tue Jun 8 17:55:33 2021 -0700
GEODE-8825: Modified test to wait for proxies to be created
---
.../cache/wan/GatewayReceiverMBeanDUnitTest.java | 39 +-
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
index e1b374c..fbf2f8e 100644
---
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
+++
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
@@ -40,16 +40,15 @@ import org.apache.geode.test.junit.categories.WanTest;
public class GatewayReceiverMBeanDUnitTest extends ManagementTestBase {
@Test
- public void testMBeanAndProxiesForGatewayReceiverAreCreated() throws
Exception {
+ public void testMBeanAndProxiesForGatewayReceiverAreCreated() {
initManagement(true);
-
// Verify MBean is created in each managed node
for (VM vm : getManagedNodeList()) {
vm.invoke(() -> {
-GatewayReceiver receiver =
getCache().createGatewayReceiverFactory().create();
+getCache().createGatewayReceiverFactory().create();
});
- vm.invoke(() -> verifyMBean());
+ vm.invoke(this::verifyMBean);
}
// Verify MBean proxies are created in the managing node
@@ -57,23 +56,34 @@ public class GatewayReceiverMBeanDUnitTest extends
ManagementTestBase {
}
@Test
- public void testMBeanAndProxiesForGatewayReceiverAreRemovedOnDestroy()
throws Exception {
+ public void testMBeanAndProxiesForGatewayReceiverAreRemovedOnDestroy() {
initManagement(true);
-// Verify MBean is created in each managed node
+// Create a GatewayReceiver and verify an MBean is created in each managed
node
for (VM vm : getManagedNodeList()) {
vm.invoke(() -> {
GatewayReceiver receiver =
getCache().createGatewayReceiverFactory().create();
receiver.start();
+ });
+ vm.invoke(this::verifyMBean);
+}
+
+// Wait for the MBean proxies to exist in the manager
+getManagingNode().invoke(() -> verifyMBeanProxies(getCache()));
+
+// Destroy the GatewayReceiver and verify its MBean is destroyed in each
managed node
+for (VM vm : getManagedNodeList()) {
+ vm.invoke(() -> {
+GatewayReceiver receiver =
getCache().getGatewayReceivers().iterator().next();
receiver.stop();
receiver.destroy();
-
});
- vm.invoke(() -> verifyMBeanDoesNotExist());
+ vm.invoke(this::verifyMBeanDoesNotExist);
}
-// Verify MBean proxies are created in the managing node
-getManagingNode().invoke(() -> verifyMBeanProxiesDoesNotExist(getCache()));
+// Wait for the MBean proxies to be removed from the managing node
+// The wait is necessary because the monitoringRegion is no-ack
+getManagingNode().invoke(() -> verifyMBeanProxiesDoNotExist(getCache()));
}
private void verifyMBean() {
@@ -94,16 +104,15 @@ public class GatewayReceiverMBeanDUnitTest extends
ManagementTestBase {
Set members =
cache.getDistributionManager().getOtherNormalDistributionManagerIds();
for (DistributedMember member : members) {
- await()
- .untilAsserted(() -> assertNotNull(getMBeanProxy(member)));
+ await().untilAsserted(() -> assertNotNull(getMBeanProxy(member)));
}
}
- private static void verifyMBeanProxiesDoesNotExist(final InternalCache
cache) {
+ private static void verifyMBeanProxiesDoNotExist(final InternalCache cache) {
Set members =
cache.getDistributionManager().getOtherNormalDistributionManagerIds();
for (DistributedMember member : members) {
- assertNull(getMBeanProxy(member));
+ await().untilAsserted(() -> assertNull(getMBeanProxy(member)));
}
}
@@ -112,6 +121,4 @@ public class GatewayReceiverMBeanDUnitTest extends
ManagementTestBase {
ObjectName objectName =
MBeanJMXAdapter.getGatewayReceiverMBeanName(member);
return service.getMBeanProxy(objectName, GatewayReceiverMXBean.class);
}
-
-
}
[geode] branch feature/GEODE-8825 created (now ac61fa8)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8825 in repository https://gitbox.apache.org/repos/asf/geode.git. at ac61fa8 GEODE-8825: Modified test to wait for proxies to be created This branch includes the following new commits: new ac61fa8 GEODE-8825: Modified test to wait for proxies to be created The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (6a3e2cb -> be70505)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 6a3e2cb GEODE-9042: Update docker-based scripts to build UG (#6528) add be70505 GEODE-9299: Assert greater than or equal instead of equals (#6536) No new revisions were added by this update. Summary of changes: .../org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)
[geode] branch feature/GEODE-9299 updated (9f95797 -> fe45da8)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9299 in repository https://gitbox.apache.org/repos/asf/geode.git. from 9f95797 GEODE-9299: Assert greater than or equal instead of equals add fe45da8 GEODE-9299: Force CI to re-run No new revisions were added by this update. Summary of changes:
[geode] 01/01: GEODE-9299: Assert greater than or equal instead of equals
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9299
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9f95797c1a9ddd8529007b1b9d4099c9e5cbf09a
Author: Barry Oglesby
AuthorDate: Thu May 27 16:57:54 2021 -0700
GEODE-9299: Assert greater than or equal instead of equals
---
.../org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
index 6d72941..2f5608d 100644
---
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
+++
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
@@ -27,7 +27,7 @@ import static
org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATO
import static
org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
import static
org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPort;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.util.Collection;
@@ -216,7 +216,7 @@ public abstract class WANRollingUpgradeDUnitTest extends
JUnit4CacheTestCase {
// Verify remote site received events
int remoteServer1EventsReceived = remoteServer1.invoke(() ->
getEventsReceived(regionName));
int remoteServer2EventsReceived = remoteServer2.invoke(() ->
getEventsReceived(regionName));
-assertEquals(numPuts, remoteServer1EventsReceived +
remoteServer2EventsReceived);
+assertThat(remoteServer1EventsReceived +
remoteServer2EventsReceived).isEqualTo(numPuts);
// Clear events received in both sites
localServer1.invoke(() -> clearEventsReceived(regionName));
@@ -230,7 +230,9 @@ public abstract class WANRollingUpgradeDUnitTest extends
JUnit4CacheTestCase {
// Verify the secondary events still exist
int localServer1QueueSize = localServer1.invoke(() ->
getQueueRegionSize(senderId, false));
int localServer2QueueSize = localServer2.invoke(() ->
getQueueRegionSize(senderId, false));
-assertEquals(numPuts, localServer1QueueSize + localServer2QueueSize);
+// The actual number of events in the queues can be greater than the
number of puts in the case
+// of a client timeout / failover
+assertThat(localServer1QueueSize +
localServer2QueueSize).isGreaterThanOrEqualTo(numPuts);
// Stop one sender
localServer1.invoke(() -> closeCache());
@@ -242,7 +244,7 @@ public abstract class WANRollingUpgradeDUnitTest extends
JUnit4CacheTestCase {
// all members, so there should be 0 events received on the remote site.
int remoteServer1EventsReceived = remoteServer1.invoke(() ->
getEventsReceived(regionName));
int remoteServer2EventsReceived = remoteServer2.invoke(() ->
getEventsReceived(regionName));
-assertEquals(0, remoteServer1EventsReceived + remoteServer2EventsReceived);
+assertThat(remoteServer1EventsReceived +
remoteServer2EventsReceived).isEqualTo(0);
}
String getCreateGatewaySenderCommand(String id, int remoteDsId) {
[geode] branch feature/GEODE-9299 created (now 9f95797)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9299 in repository https://gitbox.apache.org/repos/asf/geode.git. at 9f95797 GEODE-9299: Assert greater than or equal instead of equals This branch includes the following new commits: new 9f95797 GEODE-9299: Assert greater than or equal instead of equals The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (093f1864 -> 2bc4bd9)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 093f1864 GEODE-8772: ClientServer test port assignment (#6513) add 2bc4bd9 GEODE-9307: Removed MembershipListener after force disconnect (#6515) No new revisions were added by this update. Summary of changes: .../DistributionAdvisorIntegrationTest.java| 57 ++ .../distributed/internal/DistributionAdvisor.java | 7 ++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DistributionAdvisorIntegrationTest.java
[geode] branch feature/GEODE-9307 created (now 93166a0)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9307 in repository https://gitbox.apache.org/repos/asf/geode.git. at 93166a0 GEODE-9307: Removed MembershipListener after force disconnect No new revisions were added by this update.
[geode] branch develop updated (bc8c442 -> ce352da)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from bc8c442 GEODE-9138: Ignore failing test in windows add ce352da GEODE-9138: Refactored hasSeenEvents and added tests No new revisions were added by this update. Summary of changes: .../DistributedEventTrackerIntegrationTest.java| 150 - .../apache/geode/internal/cache/BucketRegion.java | 2 +- .../cache/event/DistributedEventTracker.java | 40 +++--- 3 files changed, 141 insertions(+), 51 deletions(-)
[geode] 01/01: GEODE-9138: Refactored and added tests
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9138-2
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 6fafd3a80005b64e54ddc3cc63bf608160d25012
Author: Barry Oglesby
AuthorDate: Mon May 3 14:04:35 2021 -0700
GEODE-9138: Refactored and added tests
---
.../DistributedEventTrackerIntegrationTest.java| 150 -
.../apache/geode/internal/cache/BucketRegion.java | 2 +-
.../cache/event/DistributedEventTracker.java | 40 +++---
3 files changed, 141 insertions(+), 51 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
index 4384e2a..7f9ca45 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.cache.event;
import static org.apache.geode.cache.RegionShortcut.PARTITION;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT;
import static org.apache.geode.cache.RegionShortcut.REPLICATE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static
org.apache.geode.internal.cache.event.DistributedEventTracker.EVENT_HAS_PREVIOUSLY_BEEN_SEEN_PREFIX;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
@@ -27,18 +31,22 @@ import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
+import java.util.Properties;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
@@ -47,50 +55,54 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.RegionsTest;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@RunWith(Parameterized.class)
-@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@Category({RegionsTest.class})
-@Ignore
+@RunWith(JUnitParamsRunner.class)
public class DistributedEventTrackerIntegrationTest {
- @Parameterized.Parameters(name = "possibleDuplicate={0}")
- public static Collection booleans() {
-return Arrays.asList(true, false);
- }
-
- @Parameterized.Parameter
- public boolean possibleDuplicate;
-
@Rule
public SerializableTestName testName = new SerializableTestName();
@Rule
- public ServerStarterRule server = new
ServerStarterRule().withNoCacheServer().withLogFile();
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ private Cache cache;
+
+ private File logFile;
@Before
public void setUp() throws Exception {
-server.startServer();
+logFile = temporaryFolder.newFile(testName.getMethodName() + ".log");
+Properties properties = new Properties();
+properties.setProperty(LOCATORS, "");
+properties.setProperty(MCAST_PORT, "0");
+properties.setProperty(LOG_FILE, logFile.getAbsolutePath());
+cache = new CacheFactory(properties).create();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+cache.close();
}
@Test
- public void testHasSeenEventReplicatedRegion() throws IOException {
+ @Parameters(method = "getPossibleDuplicates")
+ public void testHasSeenEventReplicatedRegion(boolean possibleDuplicate)
throws IOException {
// Create the replicated region
-DistributedRegion region = (DistributedRegion)
server.createRegion(REPLIC
[geode] branch feature/GEODE-9138-2 created (now 6fafd3a)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138-2 in repository https://gitbox.apache.org/repos/asf/geode.git. at 6fafd3a GEODE-9138: Refactored and added tests This branch includes the following new commits: new 6fafd3a GEODE-9138: Refactored and added tests The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (7e1ed12 -> bc8c442)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 7e1ed12 GEODE-9198: Key/trust store watcher follows symlinks (#6380) add bc8c442 GEODE-9138: Ignore failing test in windows No new revisions were added by this update. Summary of changes: .../internal/cache/event/DistributedEventTrackerIntegrationTest.java| 2 ++ 1 file changed, 2 insertions(+)
[geode] branch feature/GEODE-9138-ignore-test updated (749ba4f -> 4c8c8e6)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138-ignore-test in repository https://gitbox.apache.org/repos/asf/geode.git. from 749ba4f GEODE-9138: Ignore failing test add 4c8c8e6 GEODE-9138: Force CI to re-run No new revisions were added by this update. Summary of changes:
[geode] 01/01: GEODE-9138: Ignore failing test
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9138-ignore-test
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 749ba4f600ebac143c7a23ae11c876734fba1679
Author: Barry Oglesby
AuthorDate: Mon May 3 05:51:51 2021 -0700
GEODE-9138: Ignore failing test
---
.../internal/cache/event/DistributedEventTrackerIntegrationTest.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
index d20eb66..4384e2a 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
@@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.Optional;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -53,6 +54,7 @@ import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@Category({RegionsTest.class})
+@Ignore
public class DistributedEventTrackerIntegrationTest {
@Parameterized.Parameters(name = "possibleDuplicate={0}")
[geode] branch feature/GEODE-9138-ignore-test created (now 749ba4f)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138-ignore-test in repository https://gitbox.apache.org/repos/asf/geode.git. at 749ba4f GEODE-9138: Ignore failing test This branch includes the following new commits: new 749ba4f GEODE-9138: Ignore failing test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: Revert "GEODE-9138: Modified hasSeenEvent to log the message if necessary and and increment a stat (#6362)"
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9138-revert
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 12cd50807dd71a22ad63e4e227e0540a1408e38e
Author: Barry Oglesby
AuthorDate: Sat May 1 09:49:17 2021 -0700
Revert "GEODE-9138: Modified hasSeenEvent to log the message if necessary
and and increment a stat (#6362)"
This reverts commit d15601d16becbd483e0a66b86d78f8ab067736b8.
---
.../DistributedEventTrackerIntegrationTest.java| 146 -
.../apache/geode/internal/cache/BucketRegion.java | 4 -
.../geode/internal/cache/CachePerfStats.java | 17 +--
.../geode/internal/cache/DistributedRegion.java| 2 +-
.../geode/internal/cache/EntryEventImpl.java | 2 -
.../apache/geode/internal/cache/LocalRegion.java | 11 +-
.../geode/internal/cache/PartitionedRegion.java| 4 -
.../internal/cache/PartitionedRegionStats.java | 4 -
.../geode/internal/cache/RegionPerfStats.java | 6 -
.../cache/event/DistributedEventTracker.java | 87
.../cache/tier/sockets/command/PutAll80.java | 2 +-
.../cache/tier/sockets/command/RemoveAll.java | 2 +-
.../geode/internal/cache/CachePerfStatsTest.java | 8 --
.../geode/internal/cache/RegionPerfStatsTest.java | 7 -
.../cache/event/DistributedEventTrackerTest.java | 18 +--
.../cache/event/EventTrackerExpiryTaskTest.java| 8 +-
geode-docs/reference/statistics_list.html.md.erb | 1 -
17 files changed, 40 insertions(+), 289 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
deleted file mode 100644
index d20eb66..000
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
- * agreements. See the NOTICE file distributed with this work for additional
information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
- * or implied. See the License for the specific language governing permissions
and limitations under
- * the License.
- */
-package org.apache.geode.internal.cache.event;
-
-import static org.apache.geode.cache.RegionShortcut.PARTITION;
-import static org.apache.geode.cache.RegionShortcut.REPLICATE;
-import static
org.apache.geode.internal.cache.event.DistributedEventTracker.EVENT_HAS_PREVIOUSLY_BEEN_SEEN_PREFIX;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import org.apache.geode.cache.Operation;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.internal.cache.DistributedRegion;
-import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.test.junit.categories.RegionsTest;
-import org.apache.geode.test.junit.rules.ServerStarterRule;
-import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-
-@RunWith(Parameterized.class)
-@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
-@Category({RegionsTest.class})
-public class DistributedEventTrackerIntegrationTest {
-
- @Parameterized.Parameters(name = "possibleDuplicate={0}")
- public static Collection booleans() {
-return Arrays.asList(true, false);
- }
-
- @Parameterized.Parameter
- public boolean
[geode] branch feature/GEODE-9138-revert created (now 12cd508)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138-revert in repository https://gitbox.apache.org/repos/asf/geode.git. at 12cd508 Revert "GEODE-9138: Modified hasSeenEvent to log the message if necessary and and increment a stat (#6362)" This branch includes the following new commits: new 12cd508 Revert "GEODE-9138: Modified hasSeenEvent to log the message if necessary and and increment a stat (#6362)" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (473af50 -> 91edb37)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 473af50 GEODE-9156: Replace docker-compose-rule with testcontainers in geode-assembly (#6385) add 91edb37 GEODE-9104: Removed ESCAPE_NON_ASCII so non-ASCII characters are displayed No new revisions were added by this update. Summary of changes: .../web/controllers/RestAccessControllerTest.java | 122 - ...mer-containing-non-ascii-query-full-result.json | 7 ++ ...r-containing-non-ascii-query-struct-result.json | 6 + .../controllers/customer-containing-non-ascii.json | 5 + .../geode/rest/internal/web/util/JSONUtils.java| 2 - 5 files changed, 86 insertions(+), 56 deletions(-) create mode 100644 geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-non-ascii-query-full-result.json create mode 100644 geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-non-ascii-query-struct-result.json create mode 100644 geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-non-ascii.json
[geode] branch feature/GEODE-9138 updated: GEODE-9138: Moved debug log message and added tests
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9138
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-9138 by this
push:
new c962ce1 GEODE-9138: Moved debug log message and added tests
c962ce1 is described below
commit c962ce110fee508a0634d927f5556e7ff6561f7e
Author: Barry Oglesby
AuthorDate: Fri Apr 30 14:39:34 2021 -0700
GEODE-9138: Moved debug log message and added tests
---
.../DistributedEventTrackerIntegrationTest.java| 119 -
.../apache/geode/internal/cache/BucketRegion.java | 2 +-
.../cache/event/DistributedEventTracker.java | 43 +---
3 files changed, 121 insertions(+), 43 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
index d20eb66..7138db3 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/event/DistributedEventTrackerIntegrationTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.cache.event;
import static org.apache.geode.cache.RegionShortcut.PARTITION;
+import static org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT;
import static org.apache.geode.cache.RegionShortcut.REPLICATE;
import static
org.apache.geode.internal.cache.event.DistributedEventTracker.EVENT_HAS_PREVIOUSLY_BEEN_SEEN_PREFIX;
import static org.assertj.core.api.Assertions.assertThat;
@@ -28,12 +29,13 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.partition.PartitionRegionHelper;
@@ -48,21 +50,11 @@ import
org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.RegionsTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@RunWith(Parameterized.class)
-@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@Category({RegionsTest.class})
+@RunWith(JUnitParamsRunner.class)
public class DistributedEventTrackerIntegrationTest {
- @Parameterized.Parameters(name = "possibleDuplicate={0}")
- public static Collection booleans() {
-return Arrays.asList(true, false);
- }
-
- @Parameterized.Parameter
- public boolean possibleDuplicate;
-
@Rule
public SerializableTestName testName = new SerializableTestName();
@@ -75,20 +67,22 @@ public class DistributedEventTrackerIntegrationTest {
}
@Test
- public void testHasSeenEventReplicatedRegion() throws IOException {
+ @Parameters(method = "getPossibleDuplicates")
+ public void testHasSeenEventReplicatedRegion(boolean possibleDuplicate)
throws IOException {
// Create the replicated region
-DistributedRegion region = (DistributedRegion)
server.createRegion(REPLICATE,
-testName.getMethodName().substring(0,
testName.getMethodName().indexOf('[')));
+DistributedRegion region =
+(DistributedRegion) server.createRegion(REPLICATE,
testName.getMethodName());
// Invoke hasSeenEvent and verify results
-invokeHasSeenEventAndVerifyResults(region);
+invokeHasSeenEventAndVerifyResults(region, possibleDuplicate,
!possibleDuplicate);
}
@Test
- public void testHasSeenEventPartitionedRegion() throws IOException {
+ @Parameters(method = "getPossibleDuplicates")
+ public void testHasSeenEventPartitionedRegion(boolean possibleDuplicate)
throws IOException {
// Create the partitioned region
-PartitionedRegion region = (PartitionedRegion)
server.createRegion(PARTITION,
-testName.getMethodName().substring(0,
testName.getMethodName().indexOf('[')));
+PartitionedRegion region =
+(PartitionedRegion) server.createRegion(PARTITION,
testName.getMethodName());
// Assign buckets so that the BucketRegions and their EventTrackers are
created
PartitionRegionHelper.assignBucketsToPartitions(region);
@@ -97,19 +91,69 @@ public class DistributedEventTrackerIntegrationTest {
BucketRegion br = region.getBucketRegion(0);
// Invoke hasSeenEvent and verify results
-invokeHasSeenEventAndVerifyResul
[geode] branch feature/GEODE-9104 updated (f4769eb -> fb30760)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9104 in repository https://gitbox.apache.org/repos/asf/geode.git. from f4769eb GEODE-9104: Removed ESCAPE_NON_ASCII so non-ASCII characters are displayed add fb30760 GEODE-9104: Modified test to support UTF-8 on windows server 2016 No new revisions were added by this update. Summary of changes: .../web/controllers/RestAccessControllerTest.java | 128 +++-- 1 file changed, 41 insertions(+), 87 deletions(-)
[geode] branch feature/GEODE-9138 updated (bdfa217 -> 1f4c812)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138 in repository https://gitbox.apache.org/repos/asf/geode.git. from bdfa217 GEODE-9138: Modified hasSeenEvent to log the message if necessary and increment a stat add 1f4c812 GEODE-9138: Updated test No new revisions were added by this update. Summary of changes: .../DistributedEventTrackerIntegrationTest.java| 32 +++--- 1 file changed, 16 insertions(+), 16 deletions(-)
[geode] branch feature/GEODE-9104 created (now f4769eb)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9104 in repository https://gitbox.apache.org/repos/asf/geode.git. at f4769eb GEODE-9104: Removed ESCAPE_NON_ASCII so non-ASCII characters are displayed No new revisions were added by this update.
[geode] branch feature/GEODE-9138 updated (bc65a78 -> bdfa217)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138 in repository https://gitbox.apache.org/repos/asf/geode.git. discard bc65a78 GEODE-9138: Refactored log message discard 4171308 GEODE-9138: Refactored and added a debug log message discard e32d8d7 GEODE-9138: Added recoveries in progress check discard dcc12f2 GEODE-9138: Modified hasSeenEvent to log the message if necessary and increment a stat add bdfa217 GEODE-9138: Modified hasSeenEvent to log the message if necessary and increment a stat This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bc65a78) \ N -- N -- N refs/heads/feature/GEODE-9138 (bdfa217) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-9138 updated (4171308 -> bc65a78)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138 in repository https://gitbox.apache.org/repos/asf/geode.git. from 4171308 GEODE-9138: Refactored and added a debug log message add bc65a78 GEODE-9138: Refactored log message No new revisions were added by this update. Summary of changes: .../event/DistributedEventTrackerIntegrationTest.java | 5 +++-- .../internal/cache/event/DistributedEventTracker.java | 19 ++- 2 files changed, 17 insertions(+), 7 deletions(-)
[geode] branch feature/GEODE-8992 created (now 10b83cc)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8992 in repository https://gitbox.apache.org/repos/asf/geode.git. at 10b83cc GEODE-8992: Updated sanctionedDataSerializables.txt No new revisions were added by this update.
[geode] branch feature/GEODE-9138 updated (e32d8d7 -> 4171308)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138 in repository https://gitbox.apache.org/repos/asf/geode.git. from e32d8d7 GEODE-9138: Added recoveries in progress check add 4171308 GEODE-9138: Refactored and added a debug log message No new revisions were added by this update. Summary of changes: .../apache/geode/internal/cache/BucketRegion.java | 4 .../geode/internal/cache/PartitionedRegion.java| 4 .../cache/event/DistributedEventTracker.java | 28 ++ 3 files changed, 31 insertions(+), 5 deletions(-)
[geode] branch feature/GEODE-9138 updated (dcc12f2 -> e32d8d7)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138 in repository https://gitbox.apache.org/repos/asf/geode.git. from dcc12f2 GEODE-9138: Modified hasSeenEvent to log the message if necessary and increment a stat add e32d8d7 GEODE-9138: Added recoveries in progress check No new revisions were added by this update. Summary of changes: .../internal/cache/PartitionedRegionStats.java | 4 .../cache/event/DistributedEventTracker.java | 28 +++--- 2 files changed, 12 insertions(+), 20 deletions(-)
[geode] branch feature/GEODE-9138 created (now dcc12f2)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9138 in repository https://gitbox.apache.org/repos/asf/geode.git. at dcc12f2 GEODE-9138: Modified hasSeenEvent to log the message if necessary and increment a stat No new revisions were added by this update.
[geode] 01/01: Revert "GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed"
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9104-revert
in repository https://gitbox.apache.org/repos/asf/geode.git
commit b058f9e680547a2268af11375116522ce13c260e
Author: Barry Oglesby
AuthorDate: Thu Apr 1 16:19:09 2021 -0700
Revert "GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII
characters are displayed"
This reverts commit b7299661375ed0926303f63484cb46dae1e12ffa.
---
.../web/controllers/RestAccessControllerTest.java | 42 --
...tomer-containing-chinese-query-full-result.json | 7
...mer-containing-chinese-query-struct-result.json | 6
.../controllers/customer-containing-chinese.json | 5 ---
.../geode/rest/internal/web/util/JSONUtils.java| 2 ++
5 files changed, 2 insertions(+), 60 deletions(-)
diff --git
a/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
b/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
index 84e0a8b..5ea7510 100644
---
a/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
+++
b/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
@@ -105,12 +105,6 @@ public class RestAccessControllerTest {
private static final String ORDER_CAS_OLD_JSON = "order-cas-old.json";
private static final String ORDER_CAS_NEW_JSON = "order-cas-new.json";
private static final String ORDER_CAS_WRONG_OLD_JSON =
"order-cas-wrong-old.json";
- private static final String CUSTOMER_CONTAINING_CHINESE_JSON =
- "customer-containing-chinese.json";
- private static final String
CUSTOMER_CONTAINING_CHINESE_QUERY_FULL_RESULT_JSON =
- "customer-containing-chinese-query-full-result.json";
- private static final String
CUSTOMER_CONTAINING_CHINESE_QUERY_STRUCT_RESULT_JSON =
- "customer-containing-chinese-query-struct-result.json";
private static final String SLASH = "/";
private static final String KEY_PREFIX = "/?+ @&./";
@@ -173,9 +167,6 @@ public class RestAccessControllerTest {
loadResource(ORDER_CAS_OLD_JSON);
loadResource(ORDER_CAS_NEW_JSON);
loadResource(ORDER_CAS_WRONG_OLD_JSON);
-loadResource(CUSTOMER_CONTAINING_CHINESE_JSON);
-loadResource(CUSTOMER_CONTAINING_CHINESE_QUERY_FULL_RESULT_JSON);
-loadResource(CUSTOMER_CONTAINING_CHINESE_QUERY_STRUCT_RESULT_JSON);
RestAgent.createParameterizedQueryRegion();
@@ -1366,39 +1357,6 @@ public class RestAccessControllerTest {
}
- @Test
- @WithMockUser
- public void putGetQueryCustomerContainingMandarin() throws Exception {
-// Put customer containing mandarin
-mockMvc.perform(put("/v1/customers/1")
-.content(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_JSON))
-.with(POST_PROCESSOR))
-.andExpect(status().isOk())
-.andExpect(header().string("Location", BASE_URL + "/customers/1"));
-
-// Get customer containing mandarin
-mockMvc.perform(get("/v1/customers/1")
-.with(POST_PROCESSOR))
-.andExpect(status().isOk())
-
.andExpect(content().json(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_JSON)));
-
-// Query full customer containing mandarin
-mockMvc.perform(
-get("/v1/queries/adhoc?q=SELECT * FROM " + SEPARATOR + "customers
WHERE customerId = 1")
-.with(POST_PROCESSOR))
-.andExpect(status().isOk())
-.andExpect(
-
content().json(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_QUERY_FULL_RESULT_JSON)));
-
-// Query struct customer containing mandarin
-mockMvc.perform(get("/v1/queries/adhoc?q=SELECT firstName, lastName FROM "
+ SEPARATOR
-+ "customers WHERE customerId = 1")
-.with(POST_PROCESSOR))
-.andExpect(status().isOk())
-.andExpect(content()
-
.json(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_QUERY_STRUCT_RESULT_JSON)));
- }
-
private void deleteAllQueries() throws Exception {
MvcResult result = mockMvc.perform(get("/v1/queries")
.with(POST_PROCESSOR))
diff --git
a/geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json
b/geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json
deleted file mode 100644
index a7d63cf..000
---
a/geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-"customerId": 1,
[geode] branch feature/GEODE-9104-revert created (now b058f9e)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9104-revert in repository https://gitbox.apache.org/repos/asf/geode.git. at b058f9e Revert "GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed" This branch includes the following new commits: new b058f9e Revert "GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (f82304b -> b729966)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f82304b GEODE-9052: rename the geode-redis module (#6211) add b729966 GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed No new revisions were added by this update. Summary of changes: .../web/controllers/RestAccessControllerTest.java | 42 ++ ...tomer-containing-chinese-query-full-result.json | 7 ...mer-containing-chinese-query-struct-result.json | 6 .../controllers/customer-containing-chinese.json | 5 +++ .../geode/rest/internal/web/util/JSONUtils.java| 2 -- 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json create mode 100644 geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-struct-result.json create mode 100644 geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese.json
[geode] 01/01: GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9104
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c243b32f81c512ea0201756b5499b7be68276dfd
Author: Barry Oglesby
AuthorDate: Tue Mar 30 11:35:03 2021 -0700
GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are
displayed
---
.../web/controllers/RestAccessControllerTest.java | 42 ++
...tomer-containing-chinese-query-full-result.json | 7
...mer-containing-chinese-query-struct-result.json | 6
.../controllers/customer-containing-chinese.json | 5 +++
.../geode/rest/internal/web/util/JSONUtils.java| 2 --
5 files changed, 60 insertions(+), 2 deletions(-)
diff --git
a/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
b/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
index 5ea7510..84e0a8b 100644
---
a/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
+++
b/geode-web-api/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestAccessControllerTest.java
@@ -105,6 +105,12 @@ public class RestAccessControllerTest {
private static final String ORDER_CAS_OLD_JSON = "order-cas-old.json";
private static final String ORDER_CAS_NEW_JSON = "order-cas-new.json";
private static final String ORDER_CAS_WRONG_OLD_JSON =
"order-cas-wrong-old.json";
+ private static final String CUSTOMER_CONTAINING_CHINESE_JSON =
+ "customer-containing-chinese.json";
+ private static final String
CUSTOMER_CONTAINING_CHINESE_QUERY_FULL_RESULT_JSON =
+ "customer-containing-chinese-query-full-result.json";
+ private static final String
CUSTOMER_CONTAINING_CHINESE_QUERY_STRUCT_RESULT_JSON =
+ "customer-containing-chinese-query-struct-result.json";
private static final String SLASH = "/";
private static final String KEY_PREFIX = "/?+ @&./";
@@ -167,6 +173,9 @@ public class RestAccessControllerTest {
loadResource(ORDER_CAS_OLD_JSON);
loadResource(ORDER_CAS_NEW_JSON);
loadResource(ORDER_CAS_WRONG_OLD_JSON);
+loadResource(CUSTOMER_CONTAINING_CHINESE_JSON);
+loadResource(CUSTOMER_CONTAINING_CHINESE_QUERY_FULL_RESULT_JSON);
+loadResource(CUSTOMER_CONTAINING_CHINESE_QUERY_STRUCT_RESULT_JSON);
RestAgent.createParameterizedQueryRegion();
@@ -1357,6 +1366,39 @@ public class RestAccessControllerTest {
}
+ @Test
+ @WithMockUser
+ public void putGetQueryCustomerContainingMandarin() throws Exception {
+// Put customer containing mandarin
+mockMvc.perform(put("/v1/customers/1")
+.content(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_JSON))
+.with(POST_PROCESSOR))
+.andExpect(status().isOk())
+.andExpect(header().string("Location", BASE_URL + "/customers/1"));
+
+// Get customer containing mandarin
+mockMvc.perform(get("/v1/customers/1")
+.with(POST_PROCESSOR))
+.andExpect(status().isOk())
+
.andExpect(content().json(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_JSON)));
+
+// Query full customer containing mandarin
+mockMvc.perform(
+get("/v1/queries/adhoc?q=SELECT * FROM " + SEPARATOR + "customers
WHERE customerId = 1")
+.with(POST_PROCESSOR))
+.andExpect(status().isOk())
+.andExpect(
+
content().json(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_QUERY_FULL_RESULT_JSON)));
+
+// Query struct customer containing mandarin
+mockMvc.perform(get("/v1/queries/adhoc?q=SELECT firstName, lastName FROM "
+ SEPARATOR
++ "customers WHERE customerId = 1")
+.with(POST_PROCESSOR))
+.andExpect(status().isOk())
+.andExpect(content()
+
.json(jsonResources.get(CUSTOMER_CONTAINING_CHINESE_QUERY_STRUCT_RESULT_JSON)));
+ }
+
private void deleteAllQueries() throws Exception {
MvcResult result = mockMvc.perform(get("/v1/queries")
.with(POST_PROCESSOR))
diff --git
a/geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json
b/geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json
new file mode 100644
index 000..a7d63cf
--- /dev/null
+++
b/geode-web-api/src/integrationTest/resources/org/apache/geode/rest/internal/web/controllers/customer-containing-chinese-query-full-result.json
@@ -0,0 +1,7 @@
+[
+ {
+"customerId": 1,
+"firstName": "名",
+"lastName": "姓"
+ }
+]
\ No newl
[geode] branch feature/GEODE-9104 created (now c243b32)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9104 in repository https://gitbox.apache.org/repos/asf/geode.git. at c243b32 GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed This branch includes the following new commits: new c243b32 GEODE-9104: Removed ESCAPE_NON_ASCII feature so non-ASCII characters are displayed The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated: GEODE-9040: Shutdown ExecutorService when the SingleThreadColocationLogger is stopped
This is an automated email from the ASF dual-hosted git repository.
boglesby 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 3b422bb GEODE-9040: Shutdown ExecutorService when the
SingleThreadColocationLogger is stopped
3b422bb is described below
commit 3b422bbe9631b7531633671a3938ed9600cfbc6e
Author: Barry Oglesby
AuthorDate: Thu Mar 18 09:34:38 2021 -0700
GEODE-9040: Shutdown ExecutorService when the SingleThreadColocationLogger
is stopped
---
.../colocation/SingleThreadColocationLogger.java | 8 +++-
.../colocation/SingleThreadColocationLoggerTest.java | 15 +++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
index 6d74f74..247fb9d 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
@@ -63,7 +63,7 @@ public class SingleThreadColocationLogger implements
ColocationLogger {
this(region, delayMillis, intervalMillis, LOGGER::warn,
pr -> getAllColocationRegions(pr).keySet(),
newSingleThreadExecutor(
-runnable -> new LoggingThread("ColocationLogger for " +
region.getName(), false,
+runnable -> new LoggingThread("ColocationLogger for " +
region.getName(), true,
runnable)));
}
@@ -95,6 +95,7 @@ public class SingleThreadColocationLogger implements
ColocationLogger {
public void stop() {
synchronized (lock) {
missingChildren.clear();
+ executorService.shutdownNow();
lock.notifyAll();
}
}
@@ -151,6 +152,11 @@ public class SingleThreadColocationLogger implements
ColocationLogger {
return new ArrayList<>(missingChildren);
}
+ @VisibleForTesting
+ ExecutorService getExecutorService() {
+return executorService;
+ }
+
private Runnable checkForMissingColocatedRegionRunnable() {
return this::checkForMissingColocatedRegion;
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
index 81d043c..4b4fd11 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
@@ -18,6 +18,7 @@ import static java.lang.System.lineSeparator;
import static java.util.Collections.singleton;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.mockito.ArgumentMatchers.anyString;
@@ -213,4 +214,18 @@ public class SingleThreadColocationLoggerTest {
assertThat(colocationLogger.getMissingChildren())
.isEmpty();
}
+
+ @Test
+ public void stopTerminatesExecutorService() {
+SingleThreadColocationLogger colocationLogger =
+new SingleThreadColocationLogger(region, 500, 1000, logger,
+allColocationRegionsProvider, executorService);
+colocationLogger.start();
+
+colocationLogger.stop();
+
+// Wait until the ExecutorService is terminated
+await().untilAsserted(
+() ->
assertThat(colocationLogger.getExecutorService().isTerminated()).isTrue());
+ }
}
[geode] branch develop updated: GEODE-9030: Modified PartitionedIndex to reset arbitraryBucketIndex
This is an automated email from the ASF dual-hosted git repository.
boglesby 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 d7342cd GEODE-9030: Modified PartitionedIndex to reset
arbitraryBucketIndex
d7342cd is described below
commit d7342cd0266010313a245920dee8e82034593608
Author: Barry Oglesby
AuthorDate: Tue Mar 16 08:32:51 2021 -0700
GEODE-9030: Modified PartitionedIndex to reset arbitraryBucketIndex
---
...nequalityQueryWithRebalanceDistributedTest.java | 172 +
.../internal/index/PartitionedIndexJUnitTest.java | 65 +++-
.../query/internal/index/PartitionedIndex.java | 6 +-
3 files changed, 235 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/InequalityQueryWithRebalanceDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/InequalityQueryWithRebalanceDistributedTest.java
new file mode 100644
index 000..41ea155
--- /dev/null
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/InequalityQueryWithRebalanceDistributedTest.java
@@ -0,0 +1,172 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.query.dunit;
+
+import static org.apache.geode.cache.Region.SEPARATOR;
+
+import java.io.Serializable;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.cache.Region;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
+
+@Category({OQLIndexTest.class})
+public class InequalityQueryWithRebalanceDistributedTest implements
Serializable {
+
+ private String regionName;
+
+ private static MemberVM locator;
+
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+ @ClassRule
+ public static ClusterStartupRule cluster = new ClusterStartupRule();
+
+ @Rule
+ public SerializableTestName testName = new SerializableTestName();
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+locator = cluster.startLocatorVM(0);
+gfsh.connectAndVerify(locator);
+ }
+
+ @Before
+ public void before() throws Exception {
+regionName = getClass().getSimpleName() + "_" + testName.getMethodName() +
"_region";
+ }
+
+ @Test
+ public void testArbitraryBucketIndexUpdatedAfterBucketMoved() {
+// Start server1
+MemberVM server1 = cluster.startServerVM(1, locator.getPort());
+
+// Create the region
+createRegion();
+
+// Create the index
+createIndex();
+
+// Load entries
+server1.invoke(this::loadRegion);
+
+// Start server2
+cluster.startServerVM(2, locator.getPort());
+
+// Wait for server2 to create the region MBean
+locator.waitUntilRegionIsReadyOnExactlyThisManyServers(SEPARATOR +
regionName, 2);
+
+// Invoke rebalance
+rebalance();
+
+// Execute query
+executeQuery();
+ }
+
+ private void createRegion() {
+gfsh.executeAndAssertThat("create region --name=" + regionName
++ " --type=PARTITION --total-num-buckets=2 --partition-resolver="
++ IsolatingPartitionResolver.class.getName()).statusIsSuccess();
+locator.waitUntilRegionIsReadyOnExactlyThisManyServers(SEPARATOR +
regionName, 1);
+ }
+
+ private void createIndex() {
+gfsh.executeAndAssertThat("create index --region=" + regionName
++ " --name=tradeStatus
--expression=tradeStatus.toStri
[geode] 01/01: GEODE-9040: Shutdown ExecutorService when the SingleThreadColocationLogger is stopped
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9040
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 46270d29384937a4d31548af221f5753201cf987
Author: Barry Oglesby
AuthorDate: Mon Mar 15 16:25:12 2021 -0700
GEODE-9040: Shutdown ExecutorService when the SingleThreadColocationLogger
is stopped
---
.../colocation/SingleThreadColocationLogger.java | 8 +++-
.../colocation/SingleThreadColocationLoggerTest.java | 15 +++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
index 6d74f74..247fb9d 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLogger.java
@@ -63,7 +63,7 @@ public class SingleThreadColocationLogger implements
ColocationLogger {
this(region, delayMillis, intervalMillis, LOGGER::warn,
pr -> getAllColocationRegions(pr).keySet(),
newSingleThreadExecutor(
-runnable -> new LoggingThread("ColocationLogger for " +
region.getName(), false,
+runnable -> new LoggingThread("ColocationLogger for " +
region.getName(), true,
runnable)));
}
@@ -95,6 +95,7 @@ public class SingleThreadColocationLogger implements
ColocationLogger {
public void stop() {
synchronized (lock) {
missingChildren.clear();
+ executorService.shutdownNow();
lock.notifyAll();
}
}
@@ -151,6 +152,11 @@ public class SingleThreadColocationLogger implements
ColocationLogger {
return new ArrayList<>(missingChildren);
}
+ @VisibleForTesting
+ ExecutorService getExecutorService() {
+return executorService;
+ }
+
private Runnable checkForMissingColocatedRegionRunnable() {
return this::checkForMissingColocatedRegion;
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
index 81d043c..4b4fd11 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/colocation/SingleThreadColocationLoggerTest.java
@@ -18,6 +18,7 @@ import static java.lang.System.lineSeparator;
import static java.util.Collections.singleton;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.mockito.ArgumentMatchers.anyString;
@@ -213,4 +214,18 @@ public class SingleThreadColocationLoggerTest {
assertThat(colocationLogger.getMissingChildren())
.isEmpty();
}
+
+ @Test
+ public void stopTerminatesExecutorService() {
+SingleThreadColocationLogger colocationLogger =
+new SingleThreadColocationLogger(region, 500, 1000, logger,
+allColocationRegionsProvider, executorService);
+colocationLogger.start();
+
+colocationLogger.stop();
+
+// Wait until the ExecutorService is terminated
+await().untilAsserted(
+() ->
assertThat(colocationLogger.getExecutorService().isTerminated()).isTrue());
+ }
}
[geode] branch feature/GEODE-9040 created (now 46270d2)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9040 in repository https://gitbox.apache.org/repos/asf/geode.git. at 46270d2 GEODE-9040: Shutdown ExecutorService when the SingleThreadColocationLogger is stopped This branch includes the following new commits: new 46270d2 GEODE-9040: Shutdown ExecutorService when the SingleThreadColocationLogger is stopped The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch feature/GEODE-9030 updated (751c534 -> 2da4a24)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9030 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 751c534 GEODE-9030: Added additional unit test discard a2ca43f GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if necessary add 82bf1f9 GEODE-9000: Added logic to avoid NPE during processing Network Partition (#6129) add 39c0abf GEODE-9009: Finish support for functionality compatible with Redis DECRBY command add 37358f5 GEODE-9023: Add sharding support to redis region (#6117) add 6ead392 GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if necessary add 2da4a24 GEODE-9030: Added additional unit test This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (751c534) \ N -- N -- N refs/heads/feature/GEODE-9030 (2da4a24) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../geode/internal/cache/PartitionedRegion.java| 8 +- .../internal/cache/PartitionedRegionDataStore.java | 28 ++--- .../gms/membership/GMSJoinLeaveJUnitTest.java | 16 +++ .../membership/gms/membership/GMSJoinLeave.java| 17 ++- geode-redis/build.gradle | 1 + .../cluster/RedisPartitionResolverDUnitTest.java | 111 + .../internal/executor/string/StringsDUnitTest.java | 18 ++- .../string/AbstractDecrByIntegrationTest.java | 135 +++-- .../geode/redis/internal/RedisCommandType.java | 2 +- .../geode/redis/internal/RegionProvider.java | 37 +- .../redis/internal/data/ByteArrayWrapper.java | 41 +++ .../redis/internal/executor/cluster/CRC16.java | 71 +++ .../executor/cluster/RedisPartitionResolver.java | 17 ++- .../redis/internal/RegionProviderJUnitTest.java| 24 ++-- .../redis/internal/SupportedCommandsJUnitTest.java | 2 +- .../internal/data/ByteArrayWrapperJUnitTest.java | 65 ++ .../internal/executor/cluster/CRC16JUnitTest.java | 52 17 files changed, 556 insertions(+), 89 deletions(-) create mode 100644 geode-redis/src/distributedTest/java/org/apache/geode/redis/internal/cluster/RedisPartitionResolverDUnitTest.java create mode 100644 geode-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/CRC16.java copy geode-junit/src/main/java/org/apache/geode/management/internal/cli/commands/TestPartitionResolver.java => geode-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/RedisPartitionResolver.java (67%) copy geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LocatorMisconfigurationTest.java => geode-redis/src/test/java/org/apache/geode/redis/internal/RegionProviderJUnitTest.java (60%) create mode 100644 geode-redis/src/test/java/org/apache/geode/redis/internal/data/ByteArrayWrapperJUnitTest.java create mode 100644 geode-redis/src/test/java/org/apache/geode/redis/internal/executor/cluster/CRC16JUnitTest.java
[geode] branch feature/GEODE-9030 updated (a2ca43f -> 751c534)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9030 in repository https://gitbox.apache.org/repos/asf/geode.git. from a2ca43f GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if necessary add 751c534 GEODE-9030: Added additional unit test No new revisions were added by this update. Summary of changes: ...nequalityQueryWithRebalanceDistributedTest.java | 10 +++--- .../internal/index/PartitionedIndexJUnitTest.java | 36 +- 2 files changed, 34 insertions(+), 12 deletions(-)
[geode] branch feature/GEODE-9030 created (now a2ca43f)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-9030 in repository https://gitbox.apache.org/repos/asf/geode.git. at a2ca43f GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if necessary This branch includes the following new commits: new a2ca43f GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if necessary The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if necessary
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-9030
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a2ca43f07f420f51dc161d1e438912dd71fa9766
Author: Barry Oglesby
AuthorDate: Fri Mar 12 15:19:39 2021 -0800
GEODE-9030: Modified PartitionedIndex to reset the arbitraryBucketIndex if
necessary
---
...nequalityQueryWithRebalanceDistributedTest.java | 172 +
.../internal/index/PartitionedIndexJUnitTest.java | 43 +-
.../query/internal/index/PartitionedIndex.java | 6 +-
3 files changed, 213 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/InequalityQueryWithRebalanceDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/InequalityQueryWithRebalanceDistributedTest.java
new file mode 100644
index 000..40d42ea
--- /dev/null
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/InequalityQueryWithRebalanceDistributedTest.java
@@ -0,0 +1,172 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.query.dunit;
+
+import static org.apache.geode.cache.Region.SEPARATOR;
+
+import java.io.Serializable;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.cache.Region;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.OQLIndexTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
+
+@Category({OQLIndexTest.class})
+public class InequalityQueryWithRebalanceDistributedTest implements
Serializable {
+
+ private String regionName;
+
+ private static MemberVM locator;
+
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+ @ClassRule
+ public static ClusterStartupRule cluster = new ClusterStartupRule();
+
+ @Rule
+ public SerializableTestName testName = new SerializableTestName();
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+locator = cluster.startLocatorVM(0);
+gfsh.connectAndVerify(locator);
+ }
+
+ @Before
+ public void before() throws Exception {
+regionName = getClass().getSimpleName() + "_" + testName.getMethodName() +
"_region";
+ }
+
+ @Test
+ public void testArbitraryBucketIndexUpdatedAfterBucketMoved() throws
Exception {
+// Start server1
+MemberVM server1 = cluster.startServerVM(1, locator.getPort());
+
+// Create the region
+createRegion();
+
+// Create the index
+createIndex();
+
+// Load entries
+server1.invoke(() -> loadRegion());
+
+// Start server2
+MemberVM server2 = cluster.startServerVM(2, locator.getPort());
+
+// Wait for server2 to create the region MBean
+locator.waitUntilRegionIsReadyOnExactlyThisManyServers(SEPARATOR +
regionName, 2);
+
+// Invoke rebalance
+rebalance();
+
+// Execute query
+executeQuery();
+ }
+
+ private void createRegion() {
+gfsh.executeAndAssertThat("create region --name=" + regionName
++ " --type=PARTITION --total-num-buckets=2 --partition-resolver="
++ IsolatingPartitionResolver.class.getName()).statusIsSuccess();
+locator.waitUntilRegionIsReadyOnExactlyThisManyServers(SEPARATOR +
regionName, 1);
+ }
+
+ private void createIndex() {
+gfsh.executeAndAssertThat("create index --region=" + regionName
++ " --name=tradeStatus
--expression=tradeStatus.toString()").statusIsSuccess();
+ }
+
+ private void loadRegion() {
+Region region = ClusterStartupRule.getC
[geode] branch develop updated (e927bdf -> 403584d)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e927bdf GEODE-8859: Fix redis-compatability data structure bucket memory-usage reporting (#6084) add 403584d GEODE-8992: Added operationDetail to toData/fromData No new revisions were added by this update. Summary of changes: .../codeAnalysis/sanctionedDataSerializables.txt | 8 +- .../internal/cache/wan/GatewaySenderEventImpl.java | 17 ++- .../cache/wan/GatewaySenderEventImplTest.java | 130 +++-- 3 files changed, 142 insertions(+), 13 deletions(-)
[geode] branch feature/GEODE-8992 updated (9f94cb6 -> 10b83cc)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8992 in repository https://gitbox.apache.org/repos/asf/geode.git. from 9f94cb6 GEODE-8992: Added version check for events from remote sites add 10b83cc GEODE-8992: Updated sanctionedDataSerializables.txt No new revisions were added by this update. Summary of changes: .../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] branch feature/GEODE-8992 updated (97c9552 -> 9f94cb6)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8992 in repository https://gitbox.apache.org/repos/asf/geode.git. from 97c9552 GEODE-8992: Added operationDetail to toData/fromData add 9f94cb6 GEODE-8992: Added version check for events from remote sites No new revisions were added by this update. Summary of changes: .../org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[geode] 01/01: GEODE-8992: Added operationDetail to toData/fromData
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8992
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 97c95520e6eabdb1bb8cfa6708e0b812da8b2c17
Author: Barry Oglesby
AuthorDate: Wed Mar 3 10:38:09 2021 -0800
GEODE-8992: Added operationDetail to toData/fromData
---
.../codeAnalysis/sanctionedDataSerializables.txt | 8 +-
.../internal/cache/wan/GatewaySenderEventImpl.java | 15 ++-
.../cache/wan/GatewaySenderEventImplTest.java | 130 +++--
3 files changed, 140 insertions(+), 13 deletions(-)
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 03e7c5b..5f50033 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1922,12 +1922,14 @@
org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2
fromData,65
toData,89
-org/apache/geode/internal/cache/wan/GatewaySenderEventImpl,6
-fromData,62
+org/apache/geode/internal/cache/wan/GatewaySenderEventImpl,8
+fromData,17
fromDataPre_GEODE_1_14_0_0,31
+fromDataPre_GEODE_1_15_0_0,62
fromDataPre_GEODE_1_9_0_0,200
-toData,59
+toData,17
toDataPre_GEODE_1_14_0_0,18
+toDataPre_GEODE_1_15_0_0,59
toDataPre_GEODE_1_9_0_0,151
org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation$GatewaySenderQueueEntrySynchronizationEntry,2
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index e4a8b75..369157c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -710,6 +710,12 @@ public class GatewaySenderEventImpl
@Override
public void toData(DataOutput out,
SerializationContext context) throws IOException {
+toDataPre_GEODE_1_15_0_0(out, context);
+out.writeInt(this.operationDetail);
+ }
+
+ public void toDataPre_GEODE_1_15_0_0(DataOutput out,
+ SerializationContext context) throws IOException {
toDataPre_GEODE_1_14_0_0(out, context);
boolean hasTransaction = this.transactionId != null;
DataSerializer.writeBoolean(hasTransaction, out);
@@ -754,6 +760,12 @@ public class GatewaySenderEventImpl
@Override
public void fromData(DataInput in,
DeserializationContext context) throws IOException,
ClassNotFoundException {
+fromDataPre_GEODE_1_15_0_0(in, context);
+this.operationDetail = in.readInt();
+ }
+
+ public void fromDataPre_GEODE_1_15_0_0(DataInput in, DeserializationContext
context)
+ throws IOException, ClassNotFoundException {
fromDataPre_GEODE_1_14_0_0(in, context);
if (version >= KnownVersion.GEODE_1_14_0.ordinal()) {
boolean hasTransaction = DataSerializer.readBoolean(in);
@@ -1287,7 +1299,8 @@ public class GatewaySenderEventImpl
@Override
public KnownVersion[] getSerializationVersions() {
-return new KnownVersion[] {KnownVersion.GEODE_1_9_0,
KnownVersion.GEODE_1_14_0};
+return new KnownVersion[] {KnownVersion.GEODE_1_9_0,
KnownVersion.GEODE_1_14_0,
+KnownVersion.GEODE_1_15_0};
}
public int getSerializedValueSize() {
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImplTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImplTest.java
index 3add1a1..69f686d 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImplTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImplTest.java
@@ -15,6 +15,8 @@
package org.apache.geode.internal.cache.wan;
import static
org.apache.geode.internal.serialization.KnownVersion.GEODE_1_13_0;
+import static
org.apache.geode.internal.serialization.KnownVersion.GEODE_1_14_0;
+import static org.apache.geode.internal.serialization.KnownVersion.GEODE_1_8_0;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isA;
@@ -29,10 +31,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.TransactionId;
@@ -41,6 +46,7 @@ imp
[geode] branch feature/GEODE-8992 created (now 97c9552)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8992 in repository https://gitbox.apache.org/repos/asf/geode.git. at 97c9552 GEODE-8992: Added operationDetail to toData/fromData This branch includes the following new commits: new 97c9552 GEODE-8992: Added operationDetail to toData/fromData The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (33c81ae -> 46862ba)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 33c81ae GEODE-8930: Using WaitingThreadPool to process the message. (#6018) add 46862ba GEODE-8916: Added locators to the export stack traces command No new revisions were added by this update. Summary of changes: .../cli/commands/ExportStackTraceCommandDUnitTest.java| 11 +++ .../internal/cli/commands/ExportStackTraceCommand.java| 2 +- .../internal/cli/commands/ExportStackTraceCommandTest.java| 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-)
[geode] branch feature/GEODE-8916 updated (e82e5ef -> bbf01a4)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8916 in repository https://gitbox.apache.org/repos/asf/geode.git. from e82e5ef GEODE-8916: Force CI to re-run add bbf01a4 GEODE-8916: Updated junit test No new revisions were added by this update. Summary of changes: .../management/internal/cli/commands/ExportStackTraceCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] branch feature/GEODE-8916 updated (3dc1e7b -> e82e5ef)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8916 in repository https://gitbox.apache.org/repos/asf/geode.git. from 3dc1e7b GEODE-8916: Added locators to the export stack traces command add e82e5ef GEODE-8916: Force CI to re-run No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-8916 created (now 3dc1e7b)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8916 in repository https://gitbox.apache.org/repos/asf/geode.git. at 3dc1e7b GEODE-8916: Added locators to the export stack traces command No new revisions were added by this update.
[geode] branch feature/GEODE-8278-2 updated (b145fc3 -> ae4c0bb)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278-2 in repository https://gitbox.apache.org/repos/asf/geode.git. from b145fc3 GEODE-8278: Added debug logging to Alberto's test add ae4c0bb GEODE-8278: Added additional logging for dunit test No new revisions were added by this update. Summary of changes: .../internal/cache/InitialImageOperation.java | 27 -- ...nderOverflowMBeanAttributesDistributedTest.java | 12 -- 2 files changed, 25 insertions(+), 14 deletions(-)
[geode] branch feature/GEODE-8278 created (now 7c3e2ab)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278 in repository https://gitbox.apache.org/repos/asf/geode.git. at 7c3e2ab GEODE-8278: Update spotless No new revisions were added by this update.
[geode] branch feature/GEODE-8278-2 created (now b145fc3)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278-2 in repository https://gitbox.apache.org/repos/asf/geode.git. at b145fc3 GEODE-8278: Added debug logging to Alberto's test No new revisions were added by this update.
[geode] branch develop updated: GEODE-8827: Modified LocalRegion.initializeStats to increment bytesOnlyOnDisk
This is an automated email from the ASF dual-hosted git repository.
boglesby 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 5c6546b GEODE-8827: Modified LocalRegion.initializeStats to increment
bytesOnlyOnDisk
5c6546b is described below
commit 5c6546be40ea96f04ea976fc71b1cf41d2272773
Author: Barry Oglesby
AuthorDate: Wed Jan 20 09:58:03 2021 -1000
GEODE-8827: Modified LocalRegion.initializeStats to increment
bytesOnlyOnDisk
---
.../cache/PersistentRegionRecoveryDUnitTest.java | 40 ++
.../apache/geode/internal/cache/LocalRegion.java | 1 +
.../geode/internal/cache/LocalRegionTest.java | 25 ++
3 files changed, 66 insertions(+)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
index 77f2006..3cfd680 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionRecoveryDUnitTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
+import java.util.stream.IntStream;
import org.apache.logging.log4j.Logger;
import org.junit.After;
@@ -44,6 +45,7 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.CacheRule;
+import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedRule;
import
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -70,6 +72,10 @@ public class PersistentRegionRecoveryDUnitTest extends
JUnit4DistributedTestCase
@Rule
public SerializableTestName testName = new SerializableTestName();
+ @Rule
+ public DistributedRestoreSystemProperties restoreSystemProperties =
+ new DistributedRestoreSystemProperties();
+
@Before
public void setUp() throws Exception {
vm0 = getVM(0);
@@ -461,6 +467,40 @@ public class PersistentRegionRecoveryDUnitTest extends
JUnit4DistributedTestCase
});
}
+ @Test
+ public void verifyPersistentRecoveryIncrementsNumOverflowBytesOnDisk() {
+// Create cache and persistent region
+vm0.invoke(() -> createSyncDiskRegion());
+
+// Add entries
+int numEntries = 10;
+int entrySize = 10240;
+vm0.invoke(() -> putEntries(numEntries, entrySize));
+
+// Close cache
+vm0.invoke(() -> cacheRule.closeAndNullCache());
+
+// Recreate cache and persistent region without recovering values
+vm0.invoke(() -> {
+ System.setProperty(DiskStoreImpl.RECOVER_VALUE_PROPERTY_NAME, "false");
+ createSyncDiskRegion();
+});
+
+// Verify numOverflowBytesOnDisk is set after recovery
+vm0.invoke(() -> verifyNumOverflowBytesOnDiskSet(numEntries, entrySize));
+ }
+
+ private void putEntries(int numEntries, int entrySize) {
+Region region = cacheRule.getCache().getRegion(regionName);
+IntStream.range(0, numEntries).forEach(i -> region.put(i, new
byte[entrySize]));
+ }
+
+ private void verifyNumOverflowBytesOnDiskSet(int numEntries, int entrySize) {
+LocalRegion region = (LocalRegion)
cacheRule.getCache().getRegion(regionName);
+assertThat(region.getDiskRegion().getStats().getNumOverflowBytesOnDisk())
+.isEqualTo(numEntries * entrySize);
+ }
+
private void flushAsyncDiskRegion() {
for (DiskStore store :
cacheRule.getCache().listDiskStoresIncludingRegionOwned()) {
((DiskStoreImpl) store).forceFlush();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 61328f3..96b2738 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -10219,6 +10219,7 @@ public class LocalRegion extends AbstractRegion
implements LoaderHelperFactory,
long numOverflowBytesOnDisk) {
getDiskRegion().getStats().incNumEntriesInVM(numEntriesInVM);
getDiskRegion().getStats().incNumOverflowOnDisk(numOverflowOnDisk);
+
getDiskRegion().getStats().incNumOverflowBytesOnDisk(numOverflowBytesOnDisk);
}
/**
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java
index dd
[geode] branch feature/GEODE-8827 updated (0c7d471 -> edfeb0f)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8827 in repository https://gitbox.apache.org/repos/asf/geode.git. from 0c7d471 GEODE-8827: Modified LocalRegion.initializeStats to increment bytesOnlyOnDisk add edfeb0f GEODE-8827: Added dunit test No new revisions were added by this update. Summary of changes: .../cache/PersistentRegionRecoveryDUnitTest.java | 40 ++ 1 file changed, 40 insertions(+)
[geode] branch develop updated (81dc39e -> a9600ff)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 81dc39e GEODE-8832: reduce mass test runs from 200/wk to 100/wk (#5902) add a9600ff GEODE-8278: Modified initialImagePut to invoke LRU callback methods No new revisions were added by this update. Summary of changes: .../geode/internal/cache/AbstractRegionMap.java| 21 .../internal/cache/AbstractRegionMapTest.java | 29 ++ 2 files changed, 40 insertions(+), 10 deletions(-)
[geode] branch feature/GEODE-8827 created (now 0c7d471)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8827 in repository https://gitbox.apache.org/repos/asf/geode.git. at 0c7d471 GEODE-8827: Modified LocalRegion.initializeStats to increment bytesOnlyOnDisk This branch includes the following new commits: new 0c7d471 GEODE-8827: Modified LocalRegion.initializeStats to increment bytesOnlyOnDisk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-8827: Modified LocalRegion.initializeStats to increment bytesOnlyOnDisk
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8827
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0c7d471c4f2df6c4e0b43998226a9ab2950c8d7d
Author: Barry Oglesby
AuthorDate: Tue Jan 12 16:44:47 2021 -0800
GEODE-8827: Modified LocalRegion.initializeStats to increment
bytesOnlyOnDisk
---
.../apache/geode/internal/cache/LocalRegion.java | 1 +
.../geode/internal/cache/LocalRegionTest.java | 25 ++
2 files changed, 26 insertions(+)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 61328f3..96b2738 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -10219,6 +10219,7 @@ public class LocalRegion extends AbstractRegion
implements LoaderHelperFactory,
long numOverflowBytesOnDisk) {
getDiskRegion().getStats().incNumEntriesInVM(numEntriesInVM);
getDiskRegion().getStats().incNumOverflowOnDisk(numOverflowOnDisk);
+
getDiskRegion().getStats().incNumOverflowBytesOnDisk(numOverflowBytesOnDisk);
}
/**
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java
index dd9cce1..44599be 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalRegionTest.java
@@ -277,4 +277,29 @@ public class LocalRegionTest {
assertThat(region.isGenerateLocalFilterRoutingNeeded(event)).isFalse();
}
+
+ @Test
+ public void initializeStatsInvokesDiskRegionStatsMethods() {
+LocalRegion region =
+spy(new LocalRegion("region", regionAttributes, null, cache,
internalRegionArguments,
+internalDataView, regionMapConstructor,
serverRegionProxyConstructor, entryEventFactory,
+poolFinder, regionPerfStatsFactory, disabledClock()));
+
+// Mock DiskRegion and DiskRegionStats
+DiskRegion dr = mock(DiskRegion.class);
+when(region.getDiskRegion()).thenReturn(dr);
+DiskRegionStats drs = mock(DiskRegionStats.class);
+when(dr.getStats()).thenReturn(drs);
+
+// Invoke initializeStats
+int numEntriesInVM = 100;
+long numOverflowOnDisk = 200l;
+long numOverflowBytesOnDisk = 300l;
+region.initializeStats(numEntriesInVM, numOverflowOnDisk,
numOverflowBytesOnDisk);
+
+// Verify the DiskRegionStats methods were invoked
+verify(drs).incNumEntriesInVM(numEntriesInVM);
+verify(drs).incNumOverflowOnDisk(numOverflowOnDisk);
+verify(drs).incNumOverflowBytesOnDisk(numOverflowBytesOnDisk);
+ }
}
[geode] branch feature/GEODE-8278 updated (2d4b165 -> 7c3e2ab)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278 in repository https://gitbox.apache.org/repos/asf/geode.git. from 2d4b165 GEODE-8278: Modified initialImagePut to invoke callback methods add 7c3e2ab GEODE-8278: Update spotless No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/internal/cache/AbstractRegionMapTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[geode] branch feature/GEODE-8278 updated (0b8df11 -> 2d4b165)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278 in repository https://gitbox.apache.org/repos/asf/geode.git. from 0b8df11 GEODE-8278: Modified to cause lruEntryUpdate to be called add 2d4b165 GEODE-8278: Modified initialImagePut to invoke callback methods No new revisions were added by this update. Summary of changes: .../geode/internal/cache/AbstractRegionMap.java| 11 - .../apache/geode/internal/cache/LocalRegion.java | 1 - .../internal/cache/AbstractRegionMapTest.java | 27 ++ 3 files changed, 32 insertions(+), 7 deletions(-)
[geode] branch feature/GEODE-8278 updated: GEODE-8278: Modified to cause lruEntryUpdate to be called
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8278
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-8278 by this
push:
new 0b8df11 GEODE-8278: Modified to cause lruEntryUpdate to be called
0b8df11 is described below
commit 0b8df1158cd916b2217bc800881ae2f49fe74241
Author: Barry Oglesby
AuthorDate: Wed Dec 16 15:18:43 2020 -0800
GEODE-8278: Modified to cause lruEntryUpdate to be called
---
.../geode/internal/cache/AbstractRegionMap.java | 20 +++-
.../org/apache/geode/internal/cache/LocalRegion.java | 1 +
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index c29e8c9..87bb8c3 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -838,11 +838,11 @@ public abstract class AbstractRegionMap extends
BaseRegionMap
if (result) {
if (oldIsTombstone) {
owner.unscheduleTombstone(oldRe);
-if (newValue != Token.TOMBSTONE) {
- lruEntryCreate(oldRe);
-} else {
- lruEntryUpdate(oldRe);
-}
+ }
+ if (newValue != Token.TOMBSTONE) {
+lruEntryCreate(oldRe);
+ } else {
+lruEntryUpdate(oldRe);
}
if (newValue == Token.TOMBSTONE) {
if (!oldIsDestroyedOrRemoved) {
@@ -943,10 +943,12 @@ public abstract class AbstractRegionMap extends
BaseRegionMap
done = false;
cleared = true;
} finally {
- if (done && !deferLRUCallback) {
-lruUpdateCallback();
- } else if (!cleared) {
-resetThreadLocals();
+ if (!deferLRUCallback) {
+if (done) {
+ lruUpdateCallback();
+} else if (!cleared) {
+ resetThreadLocals();
+}
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 61328f3..96b2738 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -10219,6 +10219,7 @@ public class LocalRegion extends AbstractRegion
implements LoaderHelperFactory,
long numOverflowBytesOnDisk) {
getDiskRegion().getStats().incNumEntriesInVM(numEntriesInVM);
getDiskRegion().getStats().incNumOverflowOnDisk(numOverflowOnDisk);
+
getDiskRegion().getStats().incNumOverflowBytesOnDisk(numOverflowBytesOnDisk);
}
/**
[geode] branch feature/GEODE-8278 created (now 82f5df2)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8278 in repository https://gitbox.apache.org/repos/asf/geode.git. at 82f5df2 GEODE-6622: WAN rolling upgrade test bind exception (#5854) No new revisions were added by this update.
[geode] branch develop updated (d8e1b72 -> bda0d3f)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d8e1b72 GEODE-8577: Re-enable PubSubNativeRedisAcceptanceTest (#5847) add bda0d3f GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache No new revisions were added by this update. Summary of changes: .../modules/session/catalina/DeltaSessionManager.java | 6 +- .../session/catalina/PeerToPeerSessionCache.java | 19 +++ 2 files changed, 24 insertions(+), 1 deletion(-)
[geode] 01/01: GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8781
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f8b2cae2376c944064ff03bcc2260694d801ca85
Author: Barry Oglesby
AuthorDate: Thu Dec 10 14:17:35 2020 -0800
GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache
---
.../modules/session/catalina/DeltaSessionManager.java | 6 +-
.../session/catalina/PeerToPeerSessionCache.java | 19 +++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
index a42b0d8..997c424 100644
---
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
+++
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
@@ -551,7 +551,11 @@ public abstract class
DeltaSessionManager getMaxActive()) {
setMaxActive(currentActiveSessions);
if (getLogger().isDebugEnabled()) {
diff --git
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
index d5031c1..04e197d 100644
---
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
+++
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
@@ -27,6 +27,8 @@ import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.cache.InternalCache;
import
org.apache.geode.modules.session.catalina.callback.LocalSessionCacheLoader;
import
org.apache.geode.modules.session.catalina.callback.LocalSessionCacheWriter;
import
org.apache.geode.modules.session.catalina.callback.SessionExpirationCacheListener;
@@ -47,6 +49,7 @@ public class PeerToPeerSessionCache extends
AbstractSessionCache {
public PeerToPeerSessionCache(SessionManager sessionManager, Cache cache) {
super(sessionManager);
this.cache = cache;
+addReconnectListener();
}
@Override
@@ -242,4 +245,20 @@ public class PeerToPeerSessionCache extends
AbstractSessionCache {
Execution getExecutionForFunctionOnMembersWithArguments(Object[] arguments) {
return FunctionService.onMembers().setArguments(arguments);
}
+
+ private void addReconnectListener() {
+InternalDistributedSystem.addReconnectListener(
+new InternalDistributedSystem.ReconnectListener() {
+ @Override
+ public void onReconnect(InternalDistributedSystem oldSystem,
+ InternalDistributedSystem newSystem) {
+reinitialize(newSystem.getCache());
+ }
+});
+ }
+
+ private void reinitialize(InternalCache reconnectedCache) {
+this.cache = reconnectedCache;
+initialize();
+ }
}
[geode] branch feature/GEODE-8781 created (now f8b2cae)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8781 in repository https://gitbox.apache.org/repos/asf/geode.git. at f8b2cae GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache This branch includes the following new commits: new f8b2cae GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch feature/PeerToPeerSessionCache_ReconnectListener created (now 35ed498)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/PeerToPeerSessionCache_ReconnectListener in repository https://gitbox.apache.org/repos/asf/geode.git. at 35ed498 Added ReconnectListener to PeerToPeerSessionCache to handle reinitialization No new revisions were added by this update.
[geode] branch feature/GEODE-8324 updated (f57dea3 -> 23cfacf)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. from f57dea3 GEODE-8324: Added dunit test add 23cfacf GEODE-8324: Updated dunit test No new revisions were added by this update. Summary of changes: ...ultipleRoutesBetweenGatewaySendersDUnitTest.java | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(-)
[geode] branch feature/GEODE-8324 updated (be100b3 -> f57dea3)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. from be100b3 GEODE-8324: Don't add a remote ds id to recipients unless it is running add f57dea3 GEODE-8324: Added dunit test No new revisions were added by this update. Summary of changes: ...ltipleRoutesBetweenGatewaySendersDUnitTest.java | 64 ++ 1 file changed, 64 insertions(+) create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/MultipleRoutesBetweenGatewaySendersDUnitTest.java
[geode] branch feature/GEODE-8324 updated (be100b3 -> f57dea3)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. from be100b3 GEODE-8324: Don't add a remote ds id to recipients unless it is running add f57dea3 GEODE-8324: Added dunit test No new revisions were added by this update. Summary of changes: ...ltipleRoutesBetweenGatewaySendersDUnitTest.java | 64 ++ 1 file changed, 64 insertions(+) create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/MultipleRoutesBetweenGatewaySendersDUnitTest.java
[geode] branch feature/GEODE-8324 updated (be100b3 -> f57dea3)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. from be100b3 GEODE-8324: Don't add a remote ds id to recipients unless it is running add f57dea3 GEODE-8324: Added dunit test No new revisions were added by this update. Summary of changes: ...ltipleRoutesBetweenGatewaySendersDUnitTest.java | 64 ++ 1 file changed, 64 insertions(+) create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/MultipleRoutesBetweenGatewaySendersDUnitTest.java
[geode] branch feature/GEODE-8324 updated (be100b3 -> f57dea3)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. from be100b3 GEODE-8324: Don't add a remote ds id to recipients unless it is running add f57dea3 GEODE-8324: Added dunit test No new revisions were added by this update. Summary of changes: ...ltipleRoutesBetweenGatewaySendersDUnitTest.java | 64 ++ 1 file changed, 64 insertions(+) create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/MultipleRoutesBetweenGatewaySendersDUnitTest.java
[geode] branch feature/GEODE-8324 updated (be100b3 -> f57dea3)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. from be100b3 GEODE-8324: Don't add a remote ds id to recipients unless it is running add f57dea3 GEODE-8324: Added dunit test No new revisions were added by this update. Summary of changes: ...ltipleRoutesBetweenGatewaySendersDUnitTest.java | 64 ++ 1 file changed, 64 insertions(+) create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/MultipleRoutesBetweenGatewaySendersDUnitTest.java
