diff options
| author | Harald Musum <musum@oath.com> | 2018-12-03 22:24:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 22:24:23 +0100 |
| commit | 250d8756d3f40427375b5fe4e9d8e3af1d66e938 (patch) | |
| tree | 3d0356d372417f8f63eb71e71b07a06ee58319ef | |
| parent | 9c5f6713a54387b035a565e62ff30bb0a7b54cf8 (diff) | |
| parent | 9d7d3e04ec7f912dce1de7baf8ee3dc50908c1f8 (diff) | |
Merge pull request #7853 from vespa-engine/bratseth/increase-default-barrier-limit
Bratseth/increase default barrier limit
| -rw-r--r-- | configdefinitions/src/vespa/configserver.def | 3 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/qr.def | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index 08a9f58610a..8279f58b328 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -10,7 +10,8 @@ numRpcThreads int default=0 # ZooKeeper zookeeperserver[].hostname string zookeeperserver[].port int default=2181 -zookeeper.barrierTimeout long default=120 # in seconds +# ZK write timeout in seconds, must be long enough to write application packages to other nodes +zookeeper.barrierTimeout long default=360 zookeeperLocalhostAffinity bool default=true # Directories diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/qr.def index f06cd2061c1..d6549674137 100644 --- a/container-core/src/main/resources/configdefinitions/qr.def +++ b/container-core/src/main/resources/configdefinitions/qr.def @@ -28,5 +28,5 @@ coveragereports bool default=false restart ## this string will be unique for every QRS in a Vespa application. discriminator string default="qrserver.0" restart -## Force restart of container on deploy? +## Force restart of container on deploy, and defer any changes until restart restartOnDeploy bool default=false restart |