You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2015/08/29 01:21:50 UTC
incubator-geode git commit: Ping response message with not taking
pingRequest id.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-77 8a9294a3c -> 2435c4b95
Ping response message with not taking pingRequest id.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2435c4b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2435c4b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2435c4b9
Branch: refs/heads/feature/GEODE-77
Commit: 2435c4b950ba683b20baee5be3cdbcd2183dc49f
Parents: 8a9294a
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Fri Aug 28 16:18:52 2015 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Aug 28 16:18:52 2015 -0700
----------------------------------------------------------------------
.../internal/membership/gms/fd/GMSHealthMonitor.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2435c4b9/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index c10f2b6..babf9e3 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -225,7 +225,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
public void run() {
boolean pinged = GMSHealthMonitor.this.doCheckMember(pingMember);
if (!pinged) {
- String reason = String.format("Member isn't responding to check message: {}", pingMember);
+ String reason = String.format("Member isn't responding to check message: %s", pingMember);
GMSHealthMonitor.this.sendSuspectMessage(pingMember, reason);
} else {
logger.debug("Setting next neighbour as member {} not responded.", pingMember);
@@ -510,7 +510,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
}
private void processPingRequest(PingRequestMessage m) {
- PingResponseMessage prm = new PingResponseMessage();
+ PingResponseMessage prm = new PingResponseMessage(m.getRequestId());
prm.setRecipient(m.getSender());
Set<InternalDistributedMember> membersNotReceivedMsg = services.getMessenger().send(prm);
// TODO: send is throwing exception right now
@@ -573,7 +573,8 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
}
}
- if (check.getCoordinator().equals(localAddress)) {
+ InternalDistributedMember coordinator = check.getCoordinator();
+ if (coordinator != null && coordinator.equals(localAddress)) {
// new coordinator
doFinalCheck(smbr, cv, localAddress);
} else {