aboutsummaryrefslogtreecommitdiffstats
path: root/zkfacade/src/test
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-10-14 13:47:46 +0200
committerjonmv <venstad@gmail.com>2022-10-14 13:47:46 +0200
commit240a1334cb36080f38c14ac42099513529bb50ad (patch)
tree6fc7c2755f14054db00371a4a9297b47ea9e55b2 /zkfacade/src/test
parent6e7459c9eff635d9c8227cd8d1add320f298c0e2 (diff)
12s session timeout for application cluster curator
Diffstat (limited to 'zkfacade/src/test')
-rw-r--r--zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java3
-rw-r--r--zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
index 71eae121313..3ace79ecc67 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorTest.java
@@ -82,7 +82,8 @@ public class CuratorTest {
CuratorConfig.Server::port,
curatorConfig.zookeeperLocalhostAffinity()),
Optional.empty(),
- juteMaxBuffer);
+ juteMaxBuffer,
+ Curator.DEFAULT_ZK_SESSION_TIMEOUT);
}
}
diff --git a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java
index ab27dbbcc7b..5eb38c559a9 100644
--- a/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java
+++ b/zkfacade/src/test/java/com/yahoo/vespa/curator/CuratorWrapperTest.java
@@ -11,7 +11,6 @@ import com.yahoo.vespa.curator.mock.MockCuratorFramework;
import org.apache.curator.framework.state.ConnectionState;
import org.junit.Test;
-import java.time.Clock;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
@@ -112,7 +111,7 @@ public class CuratorWrapperTest {
stunning.arriveAndAwaitAdvance(); // Wait for next renewLease.
stunning.arriveAndAwaitAdvance(); // Let next renewLease complete.
stunning.arriveAndAwaitAdvance(); // Wait for next updateStatus.
- clock.advance(Curator.ZK_SESSION_TIMEOUT);
+ clock.advance(wrapped.sessionTimeout());
singleton.phaser.register(); // Set up so we can synchronise with deactivation.
stunning.forceTermination(); // Let lease expire, and ensure further ticks complete if we lose the race to unregister.