summaryrefslogtreecommitdiffstats
path: root/clustercontroller-core
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@verizonmedia.com>2019-06-19 15:10:09 +0200
committerTor Brede Vekterli <vekterli@verizonmedia.com>2019-06-19 15:10:09 +0200
commitc0134df0a56a91cd471d37c01f82ed3125fe67e4 (patch)
tree5ef464f9b6ee7ddbdd5d5c8983b90b0ddb254d50 /clustercontroller-core
parent24f48cc21f234fedef9d28672b6f00df6aa852c3 (diff)
Increase ZK client session timeout from 10s to 30s
Have a suspicion that 10s ends up being too short when ZK's write-ahead log flushing is taking a long time due to a heavily loaded CI container. Should still be short enough for a network hiccup to hopefully trigger a reconnect before the test itself times out.
Diffstat (limited to 'clustercontroller-core')
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
index d2fe304a72c..33f2f909910 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
@@ -39,7 +39,7 @@ public class MasterElectionTest extends FleetControllerTest {
@Rule
public TestRule cleanupZookeeperLogsOnSuccess = new CleanupZookeeperLogsOnSuccess();
- private static int defaultZkSessionTimeoutInMillis() { return 10_000; }
+ private static int defaultZkSessionTimeoutInMillis() { return 30_000; }
protected void setUpFleetController(int count, boolean useFakeTimer, FleetControllerOptions options) throws Exception {
if (zooKeeperServer == null) {