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 2018/08/09 18:41:23 UTC
[geode] branch feature/GEODE-5546 updated: GEODE-5546
auto-reconnecting member reuses old address including vmViewId
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-5546
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5546 by this push:
new 2cda003 GEODE-5546 auto-reconnecting member reuses old address including vmViewId
2cda003 is described below
commit 2cda0039a130df6b525adc66fdba1a8ce378184e
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Thu Aug 9 11:40:43 2018 -0700
GEODE-5546 auto-reconnecting member reuses old address including vmViewId
Fixing two unit test failures.
---
.../internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java | 3 ++-
.../internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
index e479553..66ad506 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
@@ -82,7 +82,8 @@ public class GMSQuorumCheckerJUnitTest {
assertTrue(quorum);
assertSame(view.getMembers().size(), answerer.getPingCount());
assertTrue(qc.checkForQuorum(500));
- assertSame(qc.getMembershipInfo(), channel);
+ assertSame(OldMembershipInformation.class, qc.getMembershipInfo().getClass());
+ assertSame(((OldMembershipInformation) qc.getMembershipInfo()).getChannel(), channel);
}
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index ce7990d..d6937db 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -45,6 +45,7 @@ import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -879,7 +880,8 @@ public class JGroupsMessengerJUnitTest {
public void testUseOldJChannel() throws Exception {
initMocks(false);
JChannel channel = messenger.myChannel;
- services.getConfig().getTransport().setOldDSMembershipInfo(channel);
+ services.getConfig().getTransport().setOldDSMembershipInfo(new OldMembershipInformation(channel,
+ Collections.singleton(new InternalDistributedMember("localhost", 10000))));
JGroupsMessenger newMessenger = new JGroupsMessenger();
newMessenger.init(services);
newMessenger.start();