You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/02/13 16:55:22 UTC
[geode] branch feature/GEODE-6369 updated: fixing unit test failures
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6369
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6369 by this push:
new c4a70d0 fixing unit test failures
c4a70d0 is described below
commit c4a70d0a2e05bb1da1b5a043de1ec17e4527e46a
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Wed Feb 13 08:54:21 2019 -0800
fixing unit test failures
---
.../java/org/apache/geode/cache30/ReconnectDUnitTest.java | 9 ++++-----
.../geode/distributed/internal/InternalDistributedSystem.java | 4 ++++
.../geode/distributed/internal/membership/gms/Services.java | 8 ++++++++
.../distributed/internal/membership/gms/fd/GMSHealthMonitor.java | 3 ++-
.../distributed/internal/membership/gms/interfaces/Service.java | 1 +
.../internal/membership/gms/membership/GMSJoinLeave.java | 6 ++++--
.../internal/membership/gms/messenger/JGroupsMessenger.java | 2 ++
7 files changed, 25 insertions(+), 8 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 8c7e602..8748784 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
@@ -485,15 +485,14 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
/** this will throw an exception if location services aren't running */
private void ensureLocationServiceRunning(VM vm) {
- vm.invoke(new SerializableRunnable("ensureLocationServiceRunning") {
- @Override
- public void run() {
+ vm.invoke("ensureLocationServiceRunning", () -> {
+ await().untilAsserted(() -> {
InternalLocator intloc = (InternalLocator) locator;
ServerLocator serverLocator = intloc.getServerLocatorAdvisee();
// the initialization flag in the locator's ControllerAdvisor will
// be set if a handshake has been performed
assertTrue(serverLocator.getDistributionAdvisor().isInitialized());
- }
+ });
});
}
@@ -1295,7 +1294,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
- return msys.isReconnecting();
+ return msys.isReconnecting() || msys.getReconnectedSystem() != null;
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 8baaf7f..78d4619 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -2758,6 +2758,10 @@ public class InternalDistributedSystem extends DistributedSystem
System.setProperty(InternalLocator.INHIBIT_DM_BANNER, inhibitBanner);
}
dm.getMembershipManager().setReconnectCompleted(true);
+ InternalDistributedSystem newds = reconnectDS;
+ if (newds != null) {
+ newds.getDM().getMembershipManager().setReconnectCompleted(true);
+ }
if (quorumChecker != null) {
mbrMgr.releaseQuorumChecker(quorumChecker, reconnectDS);
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
index 051e4aa..e8bc0b9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
@@ -180,6 +180,14 @@ public class Services {
}
}
+ public void setLocalAddress(InternalDistributedMember address) {
+ this.auth.setLocalAddress(address);
+ this.messenger.setLocalAddress(address);
+ this.joinLeave.setLocalAddress(address);
+ this.healthMon.setLocalAddress(address);
+ this.manager.setLocalAddress(address);
+ }
+
public void emergencyClose() {
if (this.stopping) {
return;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 6991efb..c50d1e5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -1009,7 +1009,8 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
stopServices();
}
- void setLocalAddress(InternalDistributedMember idm) {
+ @Override
+ public void setLocalAddress(InternalDistributedMember idm) {
this.localAddress = idm;
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java
index 0b7d2c2..403518d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java
@@ -78,4 +78,5 @@ public interface Service {
String reason);
+ default void setLocalAddress(InternalDistributedMember address) {}
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 592d120..ce022c5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1646,8 +1646,10 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
public void start() {}
@Override
- public void started() {
- this.localAddress = services.getMessenger().getMemberID();
+ public void started() {}
+
+ public void setLocalAddress(InternalDistributedMember address) {
+ this.localAddress = address;
GMSMember mbr = (GMSMember) this.localAddress.getNetMember();
if (services.getConfig().areLocatorsPreferredAsCoordinators()) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index cc0b1cc..cf526f4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -554,6 +554,8 @@ public class JGroupsMessenger implements Messenger {
gmsMember.setMemberWeight((byte) (services.getConfig().getMemberWeight() & 0xff));
gmsMember.setNetworkPartitionDetectionEnabled(
services.getConfig().getDistributionConfig().getEnableNetworkPartitionDetection());
+
+ services.setLocalAddress(localAddress);
}
@Override