You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/09/07 11:38:47 UTC

svn commit: r1701584 - /sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java

Author: stefanegli
Date: Mon Sep  7 09:38:47 2015
New Revision: 1701584

URL: http://svn.apache.org/r1701584
Log:
SLING-4991 : fix for doTestLeader : heartbeat timeout were set way too short - 1 and 2 sec - and under heavy load it looks like on apache jenkins the test can get delayed over 1 sec and thus let the heartbeat time out. increased the timeout to 30sec now for this test

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java?rev=1701584&r1=1701583&r2=1701584&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java Mon Sep  7 09:38:47 2015
@@ -160,12 +160,12 @@ public class ClusterTest {
     	instance1.stopHeartbeats();
         instance2.stop();
         instance1.stop();
-        instance1 = Instance.newStandaloneInstance("/var/discovery/impl/", "firstInstance", true, 2, 1, slingId1);
+        instance1 = Instance.newStandaloneInstance("/var/discovery/impl/", "firstInstance", true, 30, 1, slingId1);
         // sleep so that the two dont have the same startup time, and thus leaderElectionId is lower for instance1
         logger.info("doTestLeader: 1st sleep 200ms");
         Thread.sleep(200);
         instance2 = Instance.newClusterInstance("/var/discovery/impl/", "secondInstance", instance1,
-                false, 1, 1, slingId2);
+                false, 30, 1, slingId2);
         assertNotNull(instance1);
         assertNotNull(instance2);