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 2015/09/08 20:43:58 UTC
[1/2] incubator-geode git commit: GEODE-77 added an expected
client/server exception to this test
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-77 10035269c -> 29ce46131
GEODE-77 added an expected client/server exception to this test
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a0a9ce8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a0a9ce8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a0a9ce8d
Branch: refs/heads/feature/GEODE-77
Commit: a0a9ce8d8050f4106e9db4195c37fe3dad400c69
Parents: 1003526
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Sep 4 15:48:58 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Sep 4 15:48:58 2015 -0700
----------------------------------------------------------------------
.../cache/client/ClientServerRegisterInterestsDUnitTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a0a9ce8d/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index ca326b2..9d6e194 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -53,6 +53,7 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
super.setUp();
disconnectAllFromDS();
setupGemFireCacheServer();
+ addExpectedException("java.net.ConnectException");
}
@Override
[2/2] incubator-geode git commit: GEODE-77 install membership view
even if quorum has been lost
Posted by bs...@apache.org.
GEODE-77 install membership view even if quorum has been lost
If enable-network-partition-detection isn't enabled we need to go ahead
and install a new membership view when quorum has been lost.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/29ce4613
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/29ce4613
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/29ce4613
Branch: refs/heads/feature/GEODE-77
Commit: 29ce461318f98ee040447c10b6f18ef719b0ba39
Parents: a0a9ce8
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Sep 8 11:43:20 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Sep 8 11:43:20 2015 -0700
----------------------------------------------------------------------
.../internal/membership/gms/membership/GMSJoinLeave.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29ce4613/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index d852e1b..5295581 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -674,7 +674,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
public void installView(NetView newView) {
- logger.info("received new view: {}", newView);
+ logger.info("received new view: {}\nold view is: {}", newView, currentView);
synchronized(viewInstallationLock) {
if (currentView != null && currentView.getViewId() >= newView.getViewId()) {
@@ -687,8 +687,8 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
List<InternalDistributedMember> crashes = newView.getActualCrashedMembers(currentView);
services.getManager().forceDisconnect(
LocalizedStrings.Network_partition_detected.toLocalizedString(crashes.size(), crashes));
+ return;
}
- return;
}
currentView = newView;