diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-05-10 10:18:48 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-05-10 10:18:48 +0200 |
| commit | c8213111da4d3e0ac4cc73000dc9356e7ecbdb5d (patch) | |
| tree | 8de786dcec740d114b8e2153a56984f31d14f750 /container-disc/src | |
| parent | 29bcaef75fbd688421de54d5546bf0564a398ffe (diff) | |
Don't set system property if service cannot run ZooKeeper
Also fix bug related to deleting lock file
Diffstat (limited to 'container-disc/src')
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index bb791455a2f..4ee98484438 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -29,7 +29,12 @@ CONTAINER_HOME="${VESPA_HOME}/var/jdisc_container/${DISCRIMINATOR}/" if [[ "$VESPA_SERVICE_NAME" = "container" || "$VESPA_SERVICE_NAME" = "container-clustercontroller" || "$VESPA_SERVICE_NAME" = "qrserver" ]]; then ZOOKEEPER_LOG_FILE_PREFIX="${VESPA_HOME}/logs/vespa/zookeeper.${VESPA_SERVICE_NAME}" - rm -f ZOOKEEPER_LOG_FILE_PREFIX*lck + rm -f $ZOOKEEPER_LOG_FILE_PREFIX*lck + zookeeper_log_file_property="-Dzookeeper_log_file_prefix=${ZOOKEEPER_LOG_FILE_PREFIX}" +# TODO: Temporary, remove else clause after 2022-05-20 +else + ZOOKEEPER_LOG_FILE_PREFIX="${VESPA_HOME}/logs/vespa/zookeeper.${VESPA_SERVICE_NAME}" + rm -f $ZOOKEEPER_LOG_FILE_PREFIX* fi # common setup @@ -302,7 +307,7 @@ exec $numactlcmd $envcmd java \ -Djdisc.logger.tag="${VESPA_CONFIG_ID}" \ -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger \ -Dvespa.log.control.dir="${VESPA_LOG_CONTROL_DIR}" \ - -Dzookeeper_log_file_prefix="${ZOOKEEPER_LOG_FILE_PREFIX}" \ + ${zookeeper_log_file_property} \ -Dfile.encoding=UTF-8 \ -cp "$CP" \ "$@" \ |