geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [01/33] incubator-geode git commit: GEODE-588: CI failure in LocatorDUnitTest
Date Wed, 30 Dec 2015 00:28:01 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-14 b15ddfd8d -> f23e6fd72


GEODE-588: CI failure in LocatorDUnitTest

TcpServer waits up to 60 seconds for its executor pool to shut down
but InternalLocator.stop() also waits for 60 seconds for TcpServer
to shut down.  I made the stop() wait time dependent on TcpServer's
wait time and added some buffer.  I also added an expected-exception
for the suspect string that causes GEODE-588.


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

Branch: refs/heads/feature/GEODE-14
Commit: af654ca6c3cc5a5aa447cb1b8eb710d095558414
Parents: 0851f18
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Fri Dec 18 15:59:56 2015 -0800
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Fri Dec 18 15:59:56 2015 -0800

----------------------------------------------------------------------
 .../gemstone/gemfire/distributed/internal/InternalLocator.java    | 2 +-
 .../gemfire/distributed/internal/tcpserver/TcpServer.java         | 2 +-
 .../java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af654ca6/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 5090db8..9d28d1c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -965,7 +965,7 @@ public class InternalLocator extends Locator implements ConnectListener
{
       }
       boolean interrupted = Thread.interrupted();
       try {
-        this.server.join(60 * 1000);
+        this.server.join(TcpServer.SHUTDOWN_WAIT_TIME * 1000 + 10000);
   
       } catch (InterruptedException ex) {
         interrupted = true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af654ca6/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index 92793ae..f52b9ab 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -99,7 +99,7 @@ public class TcpServer {
   public static int TESTVERSION = GOSSIPVERSION;
   public static int OLDTESTVERSION = OLDGOSSIPVERSION;
 
-  private static final long SHUTDOWN_WAIT_TIME = 60 * 1000;
+  public static final long SHUTDOWN_WAIT_TIME = 60 * 1000;
   private static int MAX_POOL_SIZE = Integer.getInteger("gemfire.TcpServer.MAX_POOL_SIZE",
100).intValue();
   private static int POOL_IDLE_TIMEOUT = 60 * 1000;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af654ca6/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 80f527b..e13d0f3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -1436,12 +1436,13 @@ public class LocatorDUnitTest extends DistributedTestCase {
       vm0.invoke(getStopLocatorRunnable());
     }
   }
-
+  
   /**
    * Tests starting multiple locators in multiple VMs.
    */
   public void testMultipleMcastLocators() throws Exception {
     disconnectAllFromDS();
+    addExpectedException("Could not stop  Distribution Locator"); // shutdown timing issue
in InternalLocator
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
     VM vm1 = host.getVM(1);


Mime
View raw message