Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geode.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jchen21@apache.org
To: commits@geode.incubator.apache.org
Message-Id: <787e7d18ab9440f4999487b5ebb068a2@git.apache.org>
Subject: incubator-geode git commit: GEODE-1039: Fix CI failure
 GMSHealthMonitorJUnitTest.testCheckIfAvailableWithSimulatedHeartBeatWithTcpCheck
Date: Thu, 10 Mar 2016 19:23:30 +0000 (UTC)

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1039 [created] 85784ca8b


GEODE-1039: Fix CI failure GMSHealthMonitorJUnitTest.testCheckIfAvailableWithSimulatedHeartBeatWithTcpCheck


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

Branch: refs/heads/feature/GEODE-1039
Commit: 85784ca8b729d1f39e9e64227eb28c17c627e986
Parents: 6ce7e83
Author: Jianxia Chen <jchen@pivotal.io>
Authored: Tue Mar 8 12:51:18 2016 -0800
Committer: Jianxia Chen <jchen@pivotal.io>
Committed: Thu Mar 10 11:05:59 2016 -0800

----------------------------------------------------------------------
 .../membership/gms/fd/GMSHealthMonitor.java     |  2 +-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/85784ca8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 536e26e..82eb0b0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -1278,7 +1278,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
   
       if (!pinged && !isStopping) {
         TimeStamp ts = memberTimeStamps.get(mbr);
-        if (ts == null || ts.getTime() <= startTime) {
+        if (ts == null || ts.getTime() < startTime) {
           logger.info("Final check failed - requesting removal of suspect member " + mbr);
           if (initiateRemoval) {
             services.getJoinLeave().remove(mbr, reason);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/85784ca8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index a96b546..9324783 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -175,7 +175,7 @@ public class GMSHealthMonitorJUnitTest {
 
     // allow the monitor to give up on the initial "next neighbor" and
     // move on to the one after it
-    long giveup = System.currentTimeMillis() + memberTimeout + 500;
+    long giveup = System.currentTimeMillis() + memberTimeout + 1500;
     InternalDistributedMember expected = mockMembers.get(5);
     InternalDistributedMember neighbor = gmsHealthMonitor.getNextNeighbor();
     while (System.currentTimeMillis() < giveup && neighbor != expected) {
@@ -230,7 +230,7 @@ public class GMSHealthMonitorJUnitTest {
   }
 
   private NetView installAView() {
-    System.out.println("testSuspectMembersCalledThroughMemberCheckThread starting");
+    System.out.println("installAView starting");
     NetView v = new NetView(mockMembers.get(0), 2, mockMembers);
 
     // 3rd is current member
@@ -445,6 +445,7 @@ public class GMSHealthMonitorJUnitTest {
   
   @Test
   public void testCheckIfAvailableWithSimulatedHeartBeatWithTcpCheck() {
+    System.out.println("testCheckIfAvailableWithSimulatedHeartBeatWithTcpCheck");
     useGMSHealthMonitorTestClass = true;
     
     try {
@@ -453,15 +454,6 @@ public class GMSHealthMonitorJUnitTest {
       setFailureDetectionPorts(v);
       
       InternalDistributedMember memberToCheck = mockMembers.get(1);
-      HeartbeatMessage fakeHeartbeat = new HeartbeatMessage();
-      fakeHeartbeat.setSender(memberToCheck);
-      when(messenger.send(any(HeartbeatRequestMessage.class))).then(new Answer() {
-        @Override
-        public Object answer(InvocationOnMock invocation) throws Throwable {
-          gmsHealthMonitor.processMessage(fakeHeartbeat);
-          return null;
-        }
-      });
       
       boolean retVal = gmsHealthMonitor.checkIfAvailable(memberToCheck, "Not responding", true);
       assertTrue("CheckIfAvailable should have return true", retVal);
@@ -677,8 +669,12 @@ public class GMSHealthMonitorJUnitTest {
   public class GMSHealthMonitorTest extends GMSHealthMonitor {
     @Override
     boolean doTCPCheckMember(InternalDistributedMember suspectMember, int port) {
-      if(useGMSHealthMonitorTestClass)
+      if(useGMSHealthMonitorTestClass) {       
+        HeartbeatMessage fakeHeartbeat = new HeartbeatMessage();
+        fakeHeartbeat.setSender(suspectMember);
+        gmsHealthMonitor.processMessage(fakeHeartbeat);                
         return false;
+      }
       return super.doTCPCheckMember(suspectMember, port);
     }
   }