diff options
| author | jonmv <venstad@gmail.com> | 2022-10-21 10:27:55 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-11-10 09:43:18 +0100 |
| commit | fb4b572a7e57a00854be50516caaff22deca7419 (patch) | |
| tree | c30bbe88c1b10fab88f6b2108d43ba857d9b7e43 | |
| parent | cd91326cd9766bd4f0241c9762cd7adc852a94f0 (diff) | |
Set default value of 12s
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 2 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index edd74a12868..732b1048016 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -89,7 +89,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat private MbusParams mbusParams; private boolean messageBusEnabled = true; - private int zookeeperSessionTimeoutSeconds = -1; + private int zookeeperSessionTimeoutSeconds = 12; private final int transport_events_before_wakeup; private final int transport_connections_per_target; private final int heapSizePercentageOfTotalNodeMemory; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index 8f15a6bf745..ceb5fd81773 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -130,7 +130,7 @@ public class Nodes { /** Adds a list of newly created reserved nodes to the node repository */ public List<Node> addReservedNodes(LockedNodeList nodes) { for (Node node : nodes) { - if ( node.flavor().getType() != Flavor.Type.DOCKER_CONTAINER) + if (node.flavor().getType() != Flavor.Type.DOCKER_CONTAINER) illegal("Cannot add " + node + ": This is not a child node"); if (node.allocation().isEmpty()) illegal("Cannot add " + node + ": Child nodes need to be allocated"); |