expand tabs

1 files changed, 48 insertions, 48 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 f76f8d70455..1d21dd0c89c 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -47,13 +47,13 @@ printenv > $cfpfile || exit 1
 getconfig() {
     qrstartcfg=""
     case "${VESPA_CONFIG_ID}" in
-	dir:*)
+        dir:*)
             config_dir=${VESPA_CONFIG_ID#dir:}
-	    qrstartcfg="`cat ${config_dir}/qr-start.cfg`"
-	    ;;
-	*)
+            qrstartcfg="`cat ${config_dir}/qr-start.cfg`"
+            ;;
+        *)
             qrstartcfg="`getvespaconfig -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`"
-	    ;;
+            ;;
     esac
     cmds=`echo "$qrstartcfg" | perl -ne 's/^(\w+)\.(\w+) (.*)/$1_$2=$3/ && print'`
     eval "$cmds"
@@ -66,11 +66,11 @@ configure_memory() {
     consider_fallback jvm_directMemorySizeCache 0
 
     if (( jvm_heapSizeAsPercentageOfPhysicalMemory > 0 && jvm_heapSizeAsPercentageOfPhysicalMemory < 100 )); then
-	available=`free -m | grep Mem | tr -s ' ' | cut -f2 -d' '`
-	jvm_heapsize=$[available * jvm_heapSizeAsPercentageOfPhysicalMemory / 100]
-	if (( jvm_heapsize < 1024 )); then
+        available=`free -m | grep Mem | tr -s ' ' | cut -f2 -d' '`
+        jvm_heapsize=$[available * jvm_heapSizeAsPercentageOfPhysicalMemory / 100]
+        if (( jvm_heapsize < 1024 )); then
             jvm_heapsize=1024
-	fi
+        fi
     fi
     maxDirectMemorySize=$(( ${jvm_baseMaxDirectMemorySize} + ${jvm_heapsize}/8 + ${jvm_directMemorySizeCache} ))
 
@@ -79,36 +79,36 @@ configure_memory() {
     memory_options="${memory_options} -XX:MaxDirectMemorySize=${maxDirectMemorySize}m"    
 
     if [ "${VESPA_USE_HUGEPAGES}" ]; then
-	memory_options="${memory_options} -XX:+UseLargePages"
+        memory_options="${memory_options} -XX:+UseLargePages"
     fi
 }
 
 configure_gcopts() {
     consider_fallback jvm_gcopts "-XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1"
     if [ "$jvm_verbosegc" = "true" ]; then
-	jvm_gcopts="${jvm_gcopts} -verbose:gc"
+        jvm_gcopts="${jvm_gcopts} -verbose:gc"
     fi
 }
 
 configure_env_vars() {
     if [ "$qrs_env" ]; then
-	for setting in ${qrs_env} ; do
-	    case $setting in
-		*"="*)
-		    eval "$setting";
-		    export ${setting%%=*}
-		    ;;
-		*)
-		    echo "warning	ignoring invalid qrs_env setting '$setting' from '$qrs_env'"
-		    ;;
-	    esac
-	done
+        for setting in ${qrs_env} ; do
+            case $setting in
+                *"="*)
+                    eval "$setting";
+                    export ${setting%%=*}
+                    ;;
+                *)
+                    echo "warning	ignoring invalid qrs_env setting '$setting' from '$qrs_env'"
+                    ;;
+            esac
+        done
     fi
 }
 
 configure_classpath () {
     if [ "${jdisc_classpath_extra}" ]; then
-	CP="${CP}:${jdisc_classpath_extra}"
+        CP="${CP}:${jdisc_classpath_extra}"
     fi
 }
 
@@ -116,8 +116,8 @@ configure_preload () {
     export JAVAVM_LD_PRELOAD=
     unset LD_PRELOAD
     if [ "$PRELOAD" ]; then
-	export JAVAVM_LD_PRELOAD="$PRELOAD"
-	export LD_PRELOAD="$PRELOAD"
+        export JAVAVM_LD_PRELOAD="$PRELOAD"
+        export LD_PRELOAD="$PRELOAD"
     fi
 }
 
@@ -130,30 +130,30 @@ configure_classpath
 configure_preload
 
 exec java \
-	-Dconfig.id="${VESPA_CONFIG_ID}" \
+        -Dconfig.id="${VESPA_CONFIG_ID}" \
         ${memory_options} \
         ${jvm_gcopts} \
-	-XX:MaxJavaStackTraceDepth=-1 \
-	-XX:+HeapDumpOnOutOfMemoryError \
+        -XX:MaxJavaStackTraceDepth=-1 \
+        -XX:+HeapDumpOnOutOfMemoryError \
         -XX:HeapDumpPath="${VESPA_HOME}var/crash" \
-	-XX:OnOutOfMemoryError='kill -9 %p' \
-	-Djava.library.path="${VESPA_HOME}lib64" \
-	-Djava.awt.headless=true \
-	-Djavax.net.ssl.keyStoreType=JKS \
-	-Dsun.rmi.dgc.client.gcInterval=3600000 \
-	-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 \
-	-Djdisc.config.file="$cfpfile" \
-	-Djdisc.export.packages=${jdisc_export_packages} \
-	-Djdisc.cache.path="$bundlecachedir" \
-	-Djdisc.debug.resources=false \
-	-Djdisc.bundle.path="${VESPA_HOME}lib/jars" \
-	-Djdisc.logger.enabled=true \
-	-Djdisc.logger.level=ALL \
-	-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}" \
-	-Dzookeeperlogfile="${ZOOKEEPER_LOG_FILE}" \
-	-Dfile.encoding=UTF-8 \
-	-cp "$CP" \
+        -XX:OnOutOfMemoryError='kill -9 %p' \
+        -Djava.library.path="${VESPA_HOME}lib64" \
+        -Djava.awt.headless=true \
+        -Djavax.net.ssl.keyStoreType=JKS \
+        -Dsun.rmi.dgc.client.gcInterval=3600000 \
+        -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 \
+        -Djdisc.config.file="$cfpfile" \
+        -Djdisc.export.packages=${jdisc_export_packages} \
+        -Djdisc.cache.path="$bundlecachedir" \
+        -Djdisc.debug.resources=false \
+        -Djdisc.bundle.path="${VESPA_HOME}lib/jars" \
+        -Djdisc.logger.enabled=true \
+        -Djdisc.logger.level=ALL \
+        -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}" \
+        -Dzookeeperlogfile="${ZOOKEEPER_LOG_FILE}" \
+        -Dfile.encoding=UTF-8 \
+        -cp "$CP" \
         "$@" \
-	com.yahoo.jdisc.core.StandaloneMain file:${VESPA_HOME}lib/jars/container-disc-jar-with-dependencies.jar
+        com.yahoo.jdisc.core.StandaloneMain file:${VESPA_HOME}lib/jars/container-disc-jar-with-dependencies.jar