[geode] branch develop updated (d0585f4 -> 2b6e6c0)
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 d0585f4 GEODE-7091: Add Micrometer binders to meter registry add 2b6e6c0 Revert "GEODE-7091: Add Micrometer binders to meter registry" No new revisions were added by this update. Summary of changes: .../apache/geode/metrics/MicrometerBinderTest.java | 210 - .../metrics/CacheMeterRegistryFactory.java | 10 - .../metrics/CacheMeterRegistryFactoryTest.java | 70 --- 3 files changed, 290 deletions(-) delete mode 100644 geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/MicrometerBinderTest.java
[geode] branch release/1.10.0 updated: GEODE-7081: Prevent NPE in getLocalSize()
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch release/1.10.0
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.10.0 by this push:
new 433f5e9 GEODE-7081: Prevent NPE in getLocalSize()
433f5e9 is described below
commit 433f5e93f918d3a237e021fe06ee1e123c04d552
Author: Aaron Lindsey
AuthorDate: Mon Aug 12 15:18:22 2019 -0700
GEODE-7081: Prevent NPE in getLocalSize()
Prevent PartitionedRegion's getLocalSize() from throwing a
NullPointerException if called before its internal data store is
initialized. The stats sampler uses this method to get the region's
entry count, and stats sampling may start before the internal data store
is initialized.
(cherry picked from commit e7beb9290175405c1f285add7c538a0a18df674e)
---
.../geode/internal/cache/PartitionedRegion.java | 4
.../geode/internal/cache/PartitionedRegionTest.java | 20
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 02e90d6..7bbec97 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -6602,6 +6602,10 @@ public class PartitionedRegion extends LocalRegion
@Override
public int getLocalSize() {
+if (dataStore == null) {
+ return 0;
+}
+
return dataStore.getLocalBucket2RegionMap().values().stream()
.mapToInt(BucketRegion::getLocalSize)
.sum();
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
index 8c48a94..07cb811 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache;
import static
org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl.getSenderIdFromAsyncEventQueueId;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -42,6 +43,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.apache.geode.Statistics;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheWriter;
@@ -59,7 +61,8 @@ import org.apache.geode.test.fake.Fakes;
public class PartitionedRegionTest {
private InternalCache internalCache;
private PartitionedRegion partitionedRegion;
- private Properties gemfireProperties = new Properties();
+ @SuppressWarnings("deprecation")
+ private AttributesFactory attributesFactory;
@Before
public void setup() {
@@ -68,15 +71,16 @@ public class PartitionedRegionTest {
InternalResourceManager resourceManager =
mock(InternalResourceManager.class, RETURNS_DEEP_STUBS);
when(internalCache.getInternalResourceManager()).thenReturn(resourceManager);
-@SuppressWarnings("deprecation")
-AttributesFactory attributesFactory = new AttributesFactory();
+attributesFactory = new AttributesFactory();
attributesFactory.setPartitionAttributes(
new
PartitionAttributesFactory().setTotalNumBuckets(1).setRedundantCopies(1).create());
partitionedRegion = new PartitionedRegion("prTestRegion",
attributesFactory.create(), null,
internalCache, mock(InternalRegionArguments.class));
DistributedSystem mockDistributedSystem = mock(DistributedSystem.class);
when(internalCache.getDistributedSystem()).thenReturn(mockDistributedSystem);
-when(mockDistributedSystem.getProperties()).thenReturn(gemfireProperties);
+when(mockDistributedSystem.getProperties()).thenReturn(new Properties());
+when(mockDistributedSystem.createAtomicStatistics(any(), any()))
+.thenReturn(mock(Statistics.class));
}
@SuppressWarnings("unused")
@@ -302,4 +306,12 @@ public class PartitionedRegionTest {
Stream.of("parallel", "serial",
"anotherParallel").collect(Collectors.toSet(
.isNotEmpty().containsExactly("parallel", "anotherParallel");
}
+
+ @Test
+ public void getLocalSizeDoesNotThrowIfRegionUninitialized() {
+partitionedRegion = new PartitionedRegion("region",
attributesFactory.create(), null,
+internalCache, mock(InternalRegionArguments.class));
+
+assertThatCode(partitionedRegion::getLocalSize).doesNotThrowAnyException();
[geode] branch develop updated: GEODE-7091: Add Micrometer binders to meter registry
This is an automated email from the ASF dual-hosted git repository.
mhanson 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 d0585f4 GEODE-7091: Add Micrometer binders to meter registry
d0585f4 is described below
commit d0585f499c8865085f510cd948f5560fe7554655
Author: Aaron Lindsey
AuthorDate: Thu Aug 15 13:50:51 2019 -0700
GEODE-7091: Add Micrometer binders to meter registry
Add the following Micrometer binders:
- JvmGcMetrics
- ProcessorMetrics
- JvmThreadMetrics
- UptimeMetrics
- FileDescriptorMetrics
Co-authored-by: Aaron Lindsey
Co-authored-by: Kirk Lund
---
.../apache/geode/metrics/MicrometerBinderTest.java | 210 +
.../metrics/CacheMeterRegistryFactory.java | 10 +
.../metrics/CacheMeterRegistryFactoryTest.java | 70 +++
3 files changed, 290 insertions(+)
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/MicrometerBinderTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/MicrometerBinderTest.java
new file mode 100644
index 000..7220bd6
--- /dev/null
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/metrics/MicrometerBinderTest.java
@@ -0,0 +1,210 @@
+/*
+ * 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.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
+import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
+import io.micrometer.core.instrument.binder.system.UptimeMetrics;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.Pool;
+import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.rules.ServiceJarRule;
+import org.apache.geode.test.compiler.ClassBuilder;
+import org.apache.geode.test.junit.rules.gfsh.GfshRule;
+
+public class MicrometerBinderTest {
+
+ private Path serverFolder;
+ private ClientCache clientCache;
+ private Pool serverPool;
+ private Execution> functionExecution;
+
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Rule
+ public GfshRule gfshRule = new GfshRule();
+
+ @Rule
+ public ServiceJarRule serviceJarRule = new ServiceJarRule();
+
+ @Before
+ public void startServer() throws IOException {
+serverFolder = temporaryFolder.getRoot().toPath().toAbsolutePath();
+
+int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+
+int serverPort = ports[0];
+int jmxRmiPort = ports[1];
+
+Path serviceJarPath =
serviceJarRule.createJarFor("metrics-publishing-service.jar",
+MetricsPublishingService.class, SimpleMetricsPublishingService.class);
+
+String startServerCommand = String.join(" ",
+"start server",
+"--name=server",
+"--dir=" + serverFolder,
+"--server-port=" + serverPort,
+"--classpath=" + serviceJarPath,
+"--J=-Dgemfire.enable-cluster-config=true",
+"--J=-Dgemfire.jmx-manager=true",
+"--J=-Dgemfire.jmx-manager-start=true",
+"--J=-Dgemfire.jmx-manager-port=" + jmxRmiPort);
+
+gfshRule.execute(startServerCommand);
+
+Path functionJarPath =
serverFolder.resolve("function.jar").toAbsolutePath();
+new ClassBuilder().writeJarFromClass(CheckIfMeterExistsFunction.class,
+
[geode] branch develop updated (8e9b044 -> 550e19e)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 8e9b044 GEODE-3780 suspected member is never watched again after
passing final check (#3917)
add 550e19e GEODE-6945:geode-managment should create its own set of
configuration… (#3928)
No new revisions were added by this update.
Summary of changes:
.../resources/ManagementClientCreateRegion.java| 6 +-
...ateRegionWithDiskstoreAndSecurityDUnitTest.java | 25 +--
.../rest/ClientClusterManagementSSLTest.java | 16 +-
.../ClientClusterManagementServiceDunitTest.java | 10 +-
...ClusterManagementLocatorReconnectDunitTest.java | 7 +-
.../rest/ClusterManagementServiceOnServerTest.java | 6 +-
.../rest/ListIndexManagementDUnitTest.java | 17 +-
.../rest/ListRegionManagementDunitTest.java| 62 +++---
.../rest/ManagementRequestLoggingDUnitTest.java| 6 +-
.../rest/RebalanceManagementDunitTest.java | 6 +-
.../internal/rest/RegionManagementDunitTest.java | 35 ++--
.../internal/rest/ServerRestartTest.java | 7 +-
.../integrationTest/resources/assembly_content.txt | 1 +
.../internal/api/RegionAPIDUnitTest.java | 10 +-
.../RegionConfigMutatorIntegrationTest.java| 6 +-
.../RegionConfigRealizerIntegrationTest.java | 15 +-
.../api/LocatorClusterManagementService.java | 10 +-
.../internal/cli/commands/CreateIndexCommand.java | 11 +-
.../internal/cli/commands/CreateRegionCommand.java | 154 +-
.../cli/functions/CacheRealizationFunction.java| 4 +-
.../configuration/converters/RegionConverter.java | 65 ++
.../mutators/RegionConfigManager.java | 51 ++---
.../realizers/RegionConfigRealizer.java| 46 +++-
.../validators/RegionConfigValidator.java | 233 +
.../sanctioned-geode-management-serializables.txt | 1 +
.../cache/configuration/RegionConfigTest.java | 97 -
.../internal/api/ClusterManagementResultTest.java | 15 +-
.../api/LocatorClusterManagementServiceTest.java | 56 ++---
.../cli/commands/CreateIndexCommandTest.java | 7 +-
.../cli/commands/CreateRegionCommandTest.java | 28 +++
.../converters/RegionConverterTest.java| 98 +
.../mutators/RegionConfigManagerTest.java | 8 +-
.../realizers/RegionConfigRealizerTest.java| 58 +++--
.../validators/CacheElementValidatorTest.java | 8 +-
.../validators/MemberValidatorTest.java| 22 +-
.../validators/RegionConfigValidatorTest.java | 137 ++--
.../cli/commands/CreateRegionCommandTest.xml} | 0
.../geode/cache/configuration/RegionConfig.java| 53 +
.../geode/cache/configuration/RegionType.java | 6 +-
.../geode/management/configuration/Region.java | 137
.../configuration/CacheElementJsonMappingTest.java | 43 +---
.../cache/configuration/CacheElementTest.java | 7 +-
.../geode/management/configuration/RegionTest.java | 82
.../ClientClusterManagementServiceDUnitTest.java | 38 ++--
.../internal/rest/JsonSerializationTest.java | 8 +-
.../rest/RegionManagementIntegrationTest.java | 18 +-
.../controllers/RegionManagementController.java| 14 +-
47 files changed, 921 insertions(+), 829 deletions(-)
create mode 100644
geode-core/src/main/java/org/apache/geode/management/internal/configuration/converters/RegionConverter.java
create mode 100644
geode-core/src/test/java/org/apache/geode/management/internal/configuration/converters/RegionConverterTest.java
rename
geode-core/src/test/resources/org/apache/geode/{cache/configuration/RegionConfigTest.xml
=> management/internal/cli/commands/CreateRegionCommandTest.xml} (100%)
create mode 100644
geode-management/src/main/java/org/apache/geode/management/configuration/Region.java
create mode 100644
geode-management/src/test/java/org/apache/geode/management/configuration/RegionTest.java
[geode] 01/01: GEODE-6613: Do not set TransactionTimeout in the test.
This is an automated email from the ASF dual-hosted git repository. eshu11 pushed a commit to branch feature/GEODE-6613 in repository https://gitbox.apache.org/repos/asf/geode.git commit 667b836ae1dbd81536dbad20d1ca3adbcc87 Author: eshu AuthorDate: Thu Aug 15 13:56:13 2019 -0700 GEODE-6613: Do not set TransactionTimeout in the test. --- .../internal/cache/ClientServerTransactionFailoverDistributedTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java index 031d2a1..e73a43d 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java @@ -136,9 +136,6 @@ public class ClientServerTransactionFailoverDistributedTest implements Serializa cacheRule.getOrCreateCache().createRegionFactory(RegionShortcut.PARTITION) .setPartitionAttributes(partitionAttributes).create(regionName); -TXManagerImpl txManager = cacheRule.getCache().getTxManager(); -txManager.setTransactionTimeToLiveForTest(4); - CacheServer server = cacheRule.getCache().addCacheServer(); server.setPort(0); server.start();
[geode] branch feature/GEODE-6613 created (now 667b836)
This is an automated email from the ASF dual-hosted git repository. eshu11 pushed a change to branch feature/GEODE-6613 in repository https://gitbox.apache.org/repos/asf/geode.git. at 667b836 GEODE-6613: Do not set TransactionTimeout in the test. This branch includes the following new commits: new 667b836 GEODE-6613: Do not set TransactionTimeout in the 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] branch develop updated (86fd74d -> 8e9b044)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 86fd74d GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908) add 8e9b044 GEODE-3780 suspected member is never watched again after passing final check (#3917) No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 25 .../gms/membership/GMSJoinLeaveJUnitTest.java | 44 -- .../membership/gms/fd/GMSHealthMonitor.java| 8 ++-- .../membership/gms/interfaces/HealthMonitor.java | 6 --- .../membership/gms/membership/GMSJoinLeave.java| 20 +- 5 files changed, 70 insertions(+), 33 deletions(-)
[geode] branch feature/GEODE-3780 deleted (was a19cccb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. was a19cccb revising test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] tag develop/highwater deleted (was 7218802)
This is an automated email from the ASF dual-hosted git repository. heybales pushed a change to tag develop/highwater in repository https://gitbox.apache.org/repos/asf/geode.git. *** WARNING: tag develop/highwater was deleted! *** was 7218802 GEODE-6733 remove unused import and make spotless happay The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] tag develop/highwater created (now 42a0d0d)
This is an automated email from the ASF dual-hosted git repository. heybales pushed a change to tag develop/highwater in repository https://gitbox.apache.org/repos/asf/geode.git. at 42a0d0d (commit) No new revisions were added by this update.
[geode] branch feature/GEODE-7090 created (now e8b1709)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. at e8b1709 GEODE-7090: Remove dependency on DataSerializer from membership classes This branch includes the following new commits: new e8b1709 GEODE-7090: Remove dependency on DataSerializer from membership classes 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-3780 updated (7c08b11 -> a19cccb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. from 7c08b11 removing unused method and commented-out code add a19cccb revising test No new revisions were added by this update. Summary of changes: .../membership/gms/membership/GMSJoinLeaveJUnitTest.java| 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-)
[geode] branch feature/GEODE-7072 deleted (was da7a9cf)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. was da7a9cf adding another test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated: GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt 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 86fd74d GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908)
86fd74d is described below
commit 86fd74db98b5dff0e92ea4985651f3955c1a3420
Author: Bruce Schuchardt
AuthorDate: Thu Aug 15 10:19:19 2019 -0700
GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908)
* GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo
A number of tests were attempting to delete old locator state files
containing membership views in order to ensure that artifacts from
previously run tests were not around to infect the current test.
Unfortunately the calls to DistributedTestUtils.deleteLocatorStateFile()
were being made from the wrong working directory. Instead of looking
for the file(s) in the directory that the test's locator would use they
were looking in the unit test VMs working directory.
* adding another test
---
.../org/apache/geode/cache30/ReconnectDUnitTest.java | 14 --
.../org/apache/geode/distributed/LocatorDUnitTest.java | 13 -
.../internal/cache/snapshot/GFSnapshotDUnitTest.java | 2 +-
.../rollingupgrade/RollingUpgrade2DUnitTestBase.java | 2 +-
.../cache/rollingupgrade/RollingUpgradeClients.java | 2 +-
.../RollingUpgradeConcurrentPutsReplicated.java | 3 ++-
...lingUpgradeHARegionNameOnDifferentServerVersions.java | 2 +-
...ollingUpgradeOplogMagicSeqBackwardCompactibility.java | 2 +-
.../RollingUpgradeRollLocatorWithTwoServers.java | 2 +-
.../RollingUpgradeRollLocatorsWithOldServer.java | 3 ++-
...SingleLocatorWithMultipleServersReplicatedRegion.java | 2 +-
.../rollingupgrade/RollingUpgradeVerifyXmlEntity.java| 2 +-
...ectResultAfterTwoLocatorsWithTwoServersAreRolled.java | 3 ++-
...CorrectResultsAfterClientAndServersAreRolledOver.java | 2 +-
...erClientAndServersAreRolledOverAllBucketsCreated.java | 2 +-
...ldBeSuccessfulWhenAllServersRollToCurrentVersion.java | 2 +-
...adeCreateGatewaySenderMixedSiteOneCurrentSiteTwo.java | 4 ++--
...UpgradeEventProcessingMixedSiteOneCurrentSiteTwo.java | 16 ++--
...lingUpgradeEventProcessingMixedSiteOneOldSiteTwo.java | 4 ++--
...ngUpgradeEventProcessingOldSiteOneCurrentSiteTwo.java | 4 ++--
.../wan/WANRollingUpgradeNewSenderProcessOldEvent.java | 4 ++--
...entsNotReprocessedAfterCurrentSiteMemberFailover.java | 4 ++--
...essedAfterCurrentSiteMemberFailoverWithOldClient.java | 4 ++--
...ryEventsNotReprocessedAfterOldSiteMemberFailover.java | 4 ++--
...dRemoveCacheServerProfileToMembersOlderThan1dot5.java | 2 +-
.../wan/WANRollingUpgradeVerifyGatewaySenderProfile.java | 2 +-
26 files changed, 59 insertions(+), 47 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 87e33f1..1155abf 100755
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -320,7 +320,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
final int locPort = locatorPort;
final int secondLocPort = AvailablePortHelper.getRandomAvailableTCPPort();
-DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
final String xmlFileLoc = (new File(".")).getAbsolutePath();
@@ -473,8 +474,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
forceDisconnect(vm1);
newdm = waitForReconnect(vm1);
assertNotSame("expected a reconnect to occur in member", evenNewerdm,
newdm);
-DistributedTestUtils.deleteLocatorStateFile(locPort);
-DistributedTestUtils.deleteLocatorStateFile(secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
}
private DistributedMember getDMID(VM vm) {
@@ -553,7 +554,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
final int locPort = locatorPort;
final int secondLocPort = AvailablePortHelper.getRandomAvailableTCPPort();
-DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
final String xmlFileLoc = (new File(".")).getAbsolutePath();
@@ -638,8 +640,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
[geode] branch develop updated (c883766 -> f587101)
This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c883766 GEODE-7062: Fix Race Condition in DUnit Test (#3897) add f587101 GEODE-7085: Ensuring the bitset stays within BIT_SET_WIDTH (#3922) No new revisions were added by this update. Summary of changes: .../cache/versions/BitSetExceptionIterator.java| 91 .../internal/cache/versions/RVVException.java | 6 + .../cache/versions/RegionVersionHolder.java| 121 +++ .../versions/BitSetExceptionIteratorTest.java | 89 +++ .../versions/RegionVersionHolder2JUnitTest.java| 8 +- .../RegionVersionHolderBitSetJUnitTest.java| 165 + .../versions/RegionVersionHolderUtilities.java | 28 ++-- .../cache/versions/RegionVersionVectorTest.java| 48 +- 8 files changed, 468 insertions(+), 88 deletions(-) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/versions/BitSetExceptionIterator.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/versions/BitSetExceptionIteratorTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderBitSetJUnitTest.java copy geode-junit/src/main/java/org/apache/geode/test/junit/assertions/TabularResultModelRowAssert.java => geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderUtilities.java (54%)
[geode] branch develop updated (6f4bbbd -> c883766)
This is an automated email from the ASF dual-hosted git repository. jjramos pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 6f4bbbd GEODE-7079: Prevent NPE During Queue Conflation (#3911) add c883766 GEODE-7062: Fix Race Condition in DUnit Test (#3897) No new revisions were added by this update. Summary of changes: .../DistributedLockServiceDUnitTest.java | 36 +++--- 1 file changed, 18 insertions(+), 18 deletions(-)
