[geode] branch develop updated: GEODE-10277: For destroyed region don`t check size (#7653)
This is an automated email from the ASF dual-hosted git repository.
mivanac 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 0d58250b23 GEODE-10277: For destroyed region don`t check size (#7653)
0d58250b23 is described below
commit 0d58250b2336d547d6751e7f3d27f9a8cd432d51
Author: Mario Ivanac <48509724+miva...@users.noreply.github.com>
AuthorDate: Thu May 26 07:09:04 2022 +0200
GEODE-10277: For destroyed region don`t check size (#7653)
---
.../wan/parallel/ParallelGatewaySenderQueue.java | 9 ++
...ANPersistenceEnabledGatewaySenderDUnitTest.java | 102 +
2 files changed, 111 insertions(+)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index d3361b5207..678286c92b 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1649,6 +1649,9 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
public int localSize(boolean includeSecondary) {
int size = 0;
for (PartitionedRegion prQ : userRegionNameToShadowPRMap.values()) {
+ if (prQ.isDestroyed()) {
+continue;
+ }
if (prQ.getDataStore() != null) {
if (includeSecondary) {
size += prQ.getDataStore().getSizeOfLocalBuckets();
@@ -1667,6 +1670,9 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
public int localSizeForProcessor() {
int size = 0;
for (PartitionedRegion prQ : userRegionNameToShadowPRMap.values()) {
+ if (prQ.isDestroyed()) {
+continue;
+ }
if (((PartitionedRegion) prQ.getRegion()).getDataStore() != null) {
Set primaryBuckets =
((PartitionedRegion)
prQ.getRegion()).getDataStore().getAllLocalPrimaryBucketRegions();
@@ -1689,6 +1695,9 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
public int size() {
int size = 0;
for (PartitionedRegion prQ : userRegionNameToShadowPRMap.values()) {
+ if (prQ.isDestroyed()) {
+continue;
+ }
if (logger.isDebugEnabled()) {
logger.debug("The name of the queue region is {} and the size is {}.
keyset size is {}",
prQ.getName(), prQ.size(), prQ.keys().size());
diff --git
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index fe2a02a542..42a4fd207b 100644
---
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -2328,6 +2328,107 @@ public class
ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTest
+ /**
+ * Enable persistence for GatewaySender. Pause the sender and do some puts
in local region. Stop
+ * GatewaySender.
+ * Then start GatewaySender with clean-queues option. Check if the remote
site receives all the
+ * events.
+ */
+ @Test
+ public void
testpersistentWanGateway_restartSenderWithCleanQueuesDelayed_expectNoException()
+ throws InterruptedException {
+// create locator on local site
+Integer lnPort = vm0.invoke(() ->
WANTestBase.createFirstLocatorWithDSId(1));
+// create locator on remote site
+Integer nyPort = vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2,
lnPort));
+
+// create cache in remote site
+createCacheInVMs(nyPort, vm2, vm3);
+
+// create cache in local site
+createCacheInVMs(lnPort, vm4, vm5);
+
+// create senders with disk store
+String diskStore1 = vm4.invoke(() ->
WANTestBase.createSenderWithDiskStore("ln", 2,
+true, 100, 10, false, true, null, null, true));
+String diskStore2 = vm5.invoke(() ->
WANTestBase.createSenderWithDiskStore("ln", 2,
+true, 100, 10, false, true, null, null, true));
+
+// create PR on remote site
+vm2.invoke(
+() -> WANTestBase.createPartitionedRegion(getTestMethodName(), null,
1, 100, isOffHeap()));
+vm3.invoke(
+() -> WANTestBase.createPartitionedRegion(getTestMethodName(), null,
1, 100, isOffHeap()));
+
+// create PR on local site
+vm4.invoke(createPartitionedRegionRunnable());
+vm5.invoke(createPartitionedRegionRunnable());
+
+// start the senders on local site
+startSenderInVMs("ln", vm4, vm5);
+
+// wait for senders to
[geode] branch support/1.12 updated: Revert "Revert "GEODE-10179: Bump jackson-databind from 2.10.5.1 to 2.12.6.1 (#7506)""
This is an automated email from the ASF dual-hosted git repository.
onichols 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 c57d8a5176 Revert "Revert "GEODE-10179: Bump jackson-databind from
2.10.5.1 to 2.12.6.1 (#7506)""
c57d8a5176 is described below
commit c57d8a517636acda776c038029d0c862456684a9
Author: Owen Nichols
AuthorDate: Wed May 25 17:21:02 2022 -0700
Revert "Revert "GEODE-10179: Bump jackson-databind from 2.10.5.1 to
2.12.6.1 (#7506)""
This reverts commit f271b5335c4761b383297be4e7f858492ecd564e.
---
.../src/test/resources/expected-pom.xml| 10 +-
.../gradle/plugins/DependencyConstraints.groovy| 8
.../integrationTest/resources/assembly_content.txt | 6 +++---
.../resources/dependency_classpath.txt | 6 +++---
.../DistributedSystemMBeanIntegrationTest.java | 22 +++---
5 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index edbefe7de2..e4674ce20f 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -70,7 +70,7 @@
com.fasterxml.jackson.datatype
jackson-datatype-jsr310
-2.11.2
+2.12.6
compile
@@ -508,7 +508,7 @@
com.fasterxml.jackson.datatype
jackson-datatype-joda
-2.9.8
+2.12.6
compile
@@ -520,19 +520,19 @@
com.fasterxml.jackson.core
jackson-annotations
-2.10.5
+2.12.6
compile
com.fasterxml.jackson.core
jackson-core
-2.10.5
+2.12.6
compile
com.fasterxml.jackson.core
jackson-databind
-2.10.5.1
+2.12.6.1
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index abfb670cc4..8997f5d788 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -90,7 +90,7 @@ class DependencyConstraints implements Plugin {
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
api(group: 'com.carrotsearch.randomizedtesting', name:
'randomizedtesting-runner', version: '2.7.3')
api(group: 'com.fasterxml.jackson.module', name:
'jackson-module-scala_2.10', version: '2.10.5')
-api(group: 'com.fasterxml.jackson.datatype', name:
'jackson-datatype-jsr310', version: '2.11.2')
+api(group: 'com.fasterxml.jackson.datatype', name:
'jackson-datatype-jsr310', version: '2.12.6')
api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.1')
api(group: 'com.github.stefanbirkner', name: 'system-rules', version:
'1.19.0')
api(group: 'com.github.stephenc.findbugs', name:
'findbugs-annotations', version: '1.3.9-1')
@@ -162,17 +162,17 @@ class DependencyConstraints implements Plugin {
api(group: 'redis.clients', name: 'jedis', version: '2.9.0')
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
api(group: 'com.arakelian', name: 'java-jq', version: '0.10.1')
-api(group: 'com.fasterxml.jackson.datatype', name:
'jackson-datatype-joda', version: '2.9.8')
+api(group: 'com.fasterxml.jackson.datatype', name:
'jackson-datatype-joda', version: '2.12.6')
api(group: 'joda-time', name: 'joda-time', version: '2.9.8')
}
}
-dependencySet(group: 'com.fasterxml.jackson.core', version: '2.10.5') {
+dependencySet(group: 'com.fasterxml.jackson.core', version: '2.12.6') {
entry('jackson-annotations')
entry('jackson-core')
}
-dependencySet(group: 'com.fasterxml.jackson.core', version: '2.10.5.1') {
+dependencySet(group: 'com.fasterxml.jackson.core', version: '2.12.6.1') {
entry('jackson-databind')
}
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 9992a48d27..7e043701de 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1006,9 +1006,9 @@ lib/grumpy-core-0.2.2.jar
lib/httpclient-4.5.13.jar
lib/httpcore-4.4.14.jar
lib/istack-commons-runtime-3.0.9.jar
-lib/jackson-annotations-2.10.5.jar
-lib/jackson-core-2.10.5.jar
-lib/jackson-databind-2.10.5.1.jar
+lib/jackson-annotations-2.12.6.jar
+lib/jackson-core-2.12.6.jar
[geode] branch develop updated (18f0e9c55c -> 774505e7c7)
This is an automated email from the ASF dual-hosted git repository. klund pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git from 18f0e9c55c GEODE-10020: For Ping task avoid registering new destination endpoint (#7515) add 774505e7c7 GEODE-10327: Overhaul GfshRule to kill processes and save artifacts for failures (#7571) No new revisions were added by this update. Summary of changes: .../geode/session/tests/ContainerInstall.java | 182 +- .../geode/session/tests/ServerContainer.java | 106 +++--- .../geode/session/tests/TomcatContainer.java | 45 +-- .../apache/geode/session/tests/TomcatInstall.java | 99 -- .../MissingDiskStoreAcceptanceTest.java| 20 +- ...gDiskStoreAfterServerRestartAcceptanceTest.java | 61 ++-- .../launchers/ServerStartupNotificationTest.java | 40 +-- .../geode/launchers/ServerStartupOnlineTest.java | 44 +-- ...rStartupRedundancyRecoveryNotificationTest.java | 27 +- ...ServerStartupValueRecoveryNotificationTest.java | 42 ++- .../LocatorWithCustomLogConfigAcceptanceTest.java | 34 +- .../ServerWithCustomLogConfigAcceptanceTest.java | 28 +- .../cli/commands/ConfigureEvictionThroughGfsh.java | 196 +++ .../cli/commands/DeployWithLargeJarTest.java | 50 ++- .../cli/commands/DestroyIndexIfExistsTest.java | 37 +- .../GfshStartLocatorLogAcceptanceTest.java | 37 +- .../cli/commands/ImportClusterConfigTest.java | 26 +- ...scribeConfigAreFullyRedactedAcceptanceTest.java | 73 ++-- .../cli/commands/PutCommandWithJsonTest.java | 35 +- .../cli/commands/StartLocatorAcceptanceTest.java | 44 ++- .../commands/StartServerCommandAcceptanceTest.java | 138 +--- .../cli/commands/StatusLocatorRealGfshTest.java| 41 ++- .../cli/commands/StopServerAcceptanceTest.java | 42 ++- .../StopServerWithSecurityAcceptanceTest.java | 88 +++-- .../cli/shell/GfshDisconnectWithinScript.java | 20 +- .../shell/StatusLocatorExitCodeAcceptanceTest.java | 144 .../shell/StatusServerExitCodeAcceptanceTest.java | 95 +++-- .../rest/RegionManagementAcceptanceTest.java | 34 +- ...tandaloneClientManagementAPIAcceptanceTest.java | 117 +++--- .../apache/geode/metrics/CacheGetsTimerTest.java | 48 +-- .../geode/metrics/GatewayReceiverMetricsTest.java | 76 ++-- .../geode/metrics/MemberTypeCommonTagsTest.java| 25 +- .../apache/geode/metrics/MicrometerBinderTest.java | 27 +- .../geode/metrics/RegionEntriesGaugeTest.java | 76 ++-- .../FunctionExecutionsTimerClusterTest.java| 62 ++-- .../FunctionExecutionsTimerLonerTest.java | 45 ++- .../FunctionExecutionsTimerNoResultTest.java | 37 +- .../geode/modules/DeployJarAcceptanceTest.java | 392 + .../GfshRuleExampleTest.java} | 43 ++- ...artLocatorGlobalSerialFilterAcceptanceTest.java | 11 +- .../StartLocatorJmxSerialFilterAcceptanceTest.java | 11 +- ...tartServerGlobalSerialFilterAcceptanceTest.java | 30 +- .../StartServerJmxSerialFilterAcceptanceTest.java | 11 +- .../apache/geode/ssl/CertificateRotationTest.java | 115 +++--- .../apache/geode/session/tests/CargoTestBase.java | 2 +- .../session/tests/GenericAppServerContainer.java | 23 +- .../session/tests/GenericAppServerInstall.java | 21 +- .../Tomcat8ClientServerCustomCacheXmlTest.java | 2 +- .../session/tests/TomcatClientServerTest.java | 7 +- .../DeploymentManagementUpgradeTest.java | 105 +++--- .../management/OperationManagementUpgradeTest.java | 114 +++--- .../RollingUpgradeWithGfshDUnitTest.java | 130 --- .../management/RollingUpgradeWithSslDUnitTest.java | 137 --- .../cli/commands/ConnectCommandUpgradeTest.java| 93 +++-- .../Tomcat8ClientServerRollingUpgradeTest.java | 213 ++- ...omcatSessionBackwardsCompatibilityTestBase.java | 2 +- .../test/junit/rules/GfshExecutorVersionTest.java | 39 +- .../test/junit/rules/GfshRuleUpgradeTest.java | 85 - .../ClusterConfigDeployJarDUnitTest.java | 13 +- .../ClusterConfigImportDUnitTest.java | 13 +- .../ClusterConfigStartMemberDUnitTest.java | 16 +- .../geode/internal/process/AttachProcessUtils.java | 4 +- .../internal/process/FileControllableProcess.java | 3 + .../internal/process/LocalProcessLauncher.java | 9 +- .../geode/internal/process/NativeProcessUtils.java | 7 +- .../apache/geode/internal/process/ProcessType.java | 6 + .../geode/internal/process/ProcessUtils.java | 29 +- ...lableProcess.java => ProcessUtilsProvider.java} | 17 +- .../internal/process/NativeProcessUtilsTest.java | 17 +- .../geode/ClusterCommunicationsDUnitTest.java | 2 +- .../internal/net/SocketCreatorUpgradeTest.java | 176 - .../configuration/ClusterConfigTestBase.java | 59 ++--
