aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-27 08:18:06 +0100
committerHarald Musum <musum@oath.com>2017-11-27 08:18:06 +0100
commit0e958dd5517cdee3fd22de4e0a6ce167055bad79 (patch)
tree8bf36ede0724ae09ca5d20582c52862a36ceaf23 /configserver/src
parent7e8f8da8f249cf3c529cec8ecdcf13b69c99da13 (diff)
Add setting for turning off file distributor
If set, will not start file distributor on config server host and on tenant nodes, will instead use config proxy and file distribution will be done with RPC calls between config proxy and config server
Diffstat (limited to 'configserver/src')
-rwxr-xr-xconfigserver/src/main/sh/start-filedistribution2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution
index bb8599f2bc9..a0cf1971215 100755
--- a/configserver/src/main/sh/start-filedistribution
+++ b/configserver/src/main/sh/start-filedistribution
@@ -63,7 +63,7 @@ ROOT=${VESPA_HOME%/}
VESPA_CONFIG_ID="dir:${ROOT}/conf/filedistributor"
export VESPA_CONFIG_ID
-if [ "$multitenant" = "true" ]; then
+if [ "$multitenant" = "true" -a "$disable_filedistributor" = "false" ]; then
foo=`${ROOT}/libexec/vespa/vespa-config.pl -mkfiledistributorconfig`
PIDFILE_FILEDISTRIBUTOR=var/run/filedistributor.pid
LOGFILE="${ROOT}/logs/vespa/vespa.log"