geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject geode git commit: GEODE-2238: Fix how peers discover locators with cluster config
Date Thu, 22 Dec 2016 17:25:34 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 93d4455d8 -> f097d7a77


GEODE-2238: Fix how peers discover locators with cluster config

Call super.process last in StartupResponseWithVersionMessage, so that
that threads waiting on the response will have the results of
dm.addHostedLocators.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f097d7a7
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f097d7a7
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f097d7a7

Branch: refs/heads/develop
Commit: f097d7a776726ceed7c6a7e72782830989465adf
Parents: 93d4455
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Tue Dec 20 17:38:47 2016 -0800
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Thu Dec 22 09:15:06 2016 -0800

----------------------------------------------------------------------
 .../internal/StartupMessageReplyProcessor.java           | 11 -----------
 .../internal/StartupResponseWithVersionMessage.java      |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/f097d7a7/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
index de6e71f..f90f0da 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
@@ -101,15 +101,4 @@ public class StartupMessageReplyProcessor extends ReplyProcessor21 {
     // }
     // }
   }
-
-  /**
-   * overridden from ReplyProcessor21 to allow early-out. If an existing member accepted
or rejected
-   * us then we are done.
-   */
-  @Override
-  protected boolean canStopWaiting() {
-    return this.receivedAcceptance || this.receivedRejectionMessage;
-  }
-
-
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/f097d7a7/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
index 6276d63..5bcbb47 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
@@ -57,7 +57,6 @@ public class StartupResponseWithVersionMessage extends StartupResponseMessage
{
 
   @Override
   protected void process(DistributionManager dm) {
-    super.process(dm);
     if (this.hostedLocators != null) {
       dm.addHostedLocators(getSender(), this.hostedLocators, this.isSharedConfigurationEnabled);
     }
@@ -65,6 +64,7 @@ public class StartupResponseWithVersionMessage extends StartupResponseMessage
{
       logger.debug("Received StartupResponseWithVersionMessage from a member with version:
{}",
           this.version);
     }
+    super.process(dm);
   }
 
   public int getDSFID() {


Mime
View raw message