diff options
Diffstat (limited to 'jdisc_core/src/test')
| -rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java | 2 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/help.Levent.expected | 20 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/help.expected | 20 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/jdisc.expected | 17 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/jdisc.lall.expected | 19 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/jdisc.lall_info.expected | 4 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/jdisc.log | 19 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/jdisc.spid.expected | 17 | ||||
| -rwxr-xr-x | jdisc_core/src/test/perl/vespa-jdisc-logfmt-test.sh | 35 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/vespa.Levent.expected | 9 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/vespa.Levent.lall.expected | 19 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/vespa.expected | 18 | ||||
| -rw-r--r-- | jdisc_core/src/test/perl/vespa.log | 19 |
13 files changed, 1 insertions, 217 deletions
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java index 6836ebde496..3c74172b545 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java @@ -31,7 +31,7 @@ public class FelixParamsTestCase { public void requireThatSystemPackagesAreNotReplaced() { String systemPackages = ExportPackages.getSystemPackages(); - FelixParams params = new FelixParams(); + FelixParams params = new FelixParams(systemPackages); Map<String, String> config = params.toConfig(); assertNotNull(config); String str = config.get(Constants.FRAMEWORK_SYSTEMPACKAGES); diff --git a/jdisc_core/src/test/perl/help.Levent.expected b/jdisc_core/src/test/perl/help.Levent.expected deleted file mode 100644 index 1f7c17cd81c..00000000000 --- a/jdisc_core/src/test/perl/help.Levent.expected +++ /dev/null @@ -1,20 +0,0 @@ -Usage: vespa-jdisc-logfmt [options] [inputfile ...] -Options: - -l LEVELLIST --level=LEVELLIST select levels to include - -L LEVELLIST --add-level=LEVELLIST define extra levels - -s FIELDLIST --show=FIELDLIST select fields to print - -p PID --pid=PID select messages from given PID - -S SERVICE --service=SERVICE select messages from given SERVICE - -H HOST --host=HOST select messages from given HOST - -c REGEX --component=REGEX select components matching REGEX - -m REGEX --message=REGEX select message text matching REGEX - -f --follow invoke tail -F to follow input file - -N --nldequote dequote newlines in message text field - -t --tc --truncatecomponent chop component to 15 chars - --ts --truncateservice chop service to 9 chars - -FIELDLIST is comma separated, available fields: - time fmttime msecs usecs host level pid service component message -Available levels for LEVELLIST: - debug error event info unknown warning -for both lists, use 'all' for all possible values, and -xxx to disable xxx. diff --git a/jdisc_core/src/test/perl/help.expected b/jdisc_core/src/test/perl/help.expected deleted file mode 100644 index cadddb4cf63..00000000000 --- a/jdisc_core/src/test/perl/help.expected +++ /dev/null @@ -1,20 +0,0 @@ -Usage: vespa-jdisc-logfmt [options] [inputfile ...] -Options: - -l LEVELLIST --level=LEVELLIST select levels to include - -L LEVELLIST --add-level=LEVELLIST define extra levels - -s FIELDLIST --show=FIELDLIST select fields to print - -p PID --pid=PID select messages from given PID - -S SERVICE --service=SERVICE select messages from given SERVICE - -H HOST --host=HOST select messages from given HOST - -c REGEX --component=REGEX select components matching REGEX - -m REGEX --message=REGEX select message text matching REGEX - -f --follow invoke tail -F to follow input file - -N --nldequote dequote newlines in message text field - -t --tc --truncatecomponent chop component to 15 chars - --ts --truncateservice chop service to 9 chars - -FIELDLIST is comma separated, available fields: - time fmttime msecs usecs host level pid service component message -Available levels for LEVELLIST: - debug error info unknown warning -for both lists, use 'all' for all possible values, and -xxx to disable xxx. diff --git a/jdisc_core/src/test/perl/jdisc.expected b/jdisc_core/src/test/perl/jdisc.expected deleted file mode 100644 index 6c5d139c0cf..00000000000 --- a/jdisc_core/src/test/perl/jdisc.expected +++ /dev/null @@ -1,17 +0,0 @@ -[2013-01-25 12:46:51.180] INFO : - org.apache.felix.framework ServiceEvent REGISTERED -[2013-01-25 12:46:51.192] INFO : - jdisc_core.app-a BundleEvent INSTALLED -[2013-01-25 12:46:51.249] INFO : - jdisc_core.app-a BundleEvent RESOLVED -[2013-01-25 12:46:51.249] INFO : - jdisc_core.app-a BundleEvent STARTED -[2013-01-25 12:46:51.334] INFO : - jdisc_core.app-a BundleEvent STOPPED -[2013-01-25 12:46:51.335] INFO : - jdisc_core.app-a BundleEvent UNRESOLVED -[2013-01-25 12:46:51.335] INFO : - jdisc_core.app-a BundleEvent UNINSTALLED -[2013-01-25 12:46:51.376] INFO : - org.apache.felix.framework ServiceEvent REGISTERED -[2013-01-25 12:46:51.377] ERROR : - jdisc_core.app-a my_error -[2013-01-25 12:46:51.377] WARNING : - jdisc_core.app-a my_warning -[2013-01-25 12:46:51.377] INFO : - jdisc_core.app-a my_info -[2013-01-25 12:46:51.379] INFO : - jdisc_core.app-a BundleEvent INSTALLED -[2013-01-25 12:46:51.383] INFO : - jdisc_core.app-a BundleEvent RESOLVED -[2013-01-25 12:46:51.383] INFO : - jdisc_core.app-a BundleEvent STARTED -[2013-01-25 12:46:51.389] INFO : - jdisc_core.app-a BundleEvent STOPPED -[2013-01-25 12:46:51.389] INFO : - jdisc_core.app-a BundleEvent UNRESOLVED -[2013-01-25 12:46:51.390] INFO : - jdisc_core.app-a BundleEvent UNINSTALLED diff --git a/jdisc_core/src/test/perl/jdisc.lall.expected b/jdisc_core/src/test/perl/jdisc.lall.expected deleted file mode 100644 index 58875bba8db..00000000000 --- a/jdisc_core/src/test/perl/jdisc.lall.expected +++ /dev/null @@ -1,19 +0,0 @@ -[2013-01-25 12:46:51.180] INFO : - org.apache.felix.framework ServiceEvent REGISTERED -[2013-01-25 12:46:51.192] INFO : - jdisc_core.app-a BundleEvent INSTALLED -[2013-01-25 12:46:51.249] INFO : - jdisc_core.app-a BundleEvent RESOLVED -[2013-01-25 12:46:51.249] INFO : - jdisc_core.app-a BundleEvent STARTED -[2013-01-25 12:46:51.334] INFO : - jdisc_core.app-a BundleEvent STOPPED -[2013-01-25 12:46:51.335] INFO : - jdisc_core.app-a BundleEvent UNRESOLVED -[2013-01-25 12:46:51.335] INFO : - jdisc_core.app-a BundleEvent UNINSTALLED -[2013-01-25 12:46:51.376] INFO : - org.apache.felix.framework ServiceEvent REGISTERED -[2013-01-25 12:46:51.377] ERROR : - jdisc_core.app-a my_error -[2013-01-25 12:46:51.377] WARNING : - jdisc_core.app-a my_warning -[2013-01-25 12:46:51.377] INFO : - jdisc_core.app-a my_info -[2013-01-25 12:46:51.377] DEBUG : - jdisc_core.app-a my_debug -[2013-01-25 12:46:51.377] UNKNOWN : - jdisc_core.app-a my_unknown -[2013-01-25 12:46:51.379] INFO : - jdisc_core.app-a BundleEvent INSTALLED -[2013-01-25 12:46:51.383] INFO : - jdisc_core.app-a BundleEvent RESOLVED -[2013-01-25 12:46:51.383] INFO : - jdisc_core.app-a BundleEvent STARTED -[2013-01-25 12:46:51.389] INFO : - jdisc_core.app-a BundleEvent STOPPED -[2013-01-25 12:46:51.389] INFO : - jdisc_core.app-a BundleEvent UNRESOLVED -[2013-01-25 12:46:51.390] INFO : - jdisc_core.app-a BundleEvent UNINSTALLED diff --git a/jdisc_core/src/test/perl/jdisc.lall_info.expected b/jdisc_core/src/test/perl/jdisc.lall_info.expected deleted file mode 100644 index da834dddc9b..00000000000 --- a/jdisc_core/src/test/perl/jdisc.lall_info.expected +++ /dev/null @@ -1,4 +0,0 @@ -[2013-01-25 12:46:51.377] ERROR : - jdisc_core.app-a my_error -[2013-01-25 12:46:51.377] WARNING : - jdisc_core.app-a my_warning -[2013-01-25 12:46:51.377] DEBUG : - jdisc_core.app-a my_debug -[2013-01-25 12:46:51.377] UNKNOWN : - jdisc_core.app-a my_unknown diff --git a/jdisc_core/src/test/perl/jdisc.log b/jdisc_core/src/test/perl/jdisc.log deleted file mode 100644 index 37a74a595ca..00000000000 --- a/jdisc_core/src/test/perl/jdisc.log +++ /dev/null @@ -1,19 +0,0 @@ -1359114411.180 gentleadd-lm 35172 - org.apache.felix.framework info ServiceEvent REGISTERED -1359114411.192 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent INSTALLED -1359114411.249 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent RESOLVED -1359114411.249 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent STARTED -1359114411.334 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent STOPPED -1359114411.335 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent UNRESOLVED -1359114411.335 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent UNINSTALLED -1359114411.376 gentleadd-lm 35172 - org.apache.felix.framework info ServiceEvent REGISTERED -1359114411.377 gentleadd-lm 35172 - jdisc_core.app-a error my_error -1359114411.377 gentleadd-lm 35172 - jdisc_core.app-a warning my_warning -1359114411.377 gentleadd-lm 35172 - jdisc_core.app-a info my_info -1359114411.377 gentleadd-lm 35172 - jdisc_core.app-a debug my_debug -1359114411.377 gentleadd-lm 35172 - jdisc_core.app-a unknown my_unknown -1359114411.379 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent INSTALLED -1359114411.383 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent RESOLVED -1359114411.383 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent STARTED -1359114411.389 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent STOPPED -1359114411.389 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent UNRESOLVED -1359114411.390 gentleadd-lm 35172 - jdisc_core.app-a info BundleEvent UNINSTALLED diff --git a/jdisc_core/src/test/perl/jdisc.spid.expected b/jdisc_core/src/test/perl/jdisc.spid.expected deleted file mode 100644 index 44963161dcf..00000000000 --- a/jdisc_core/src/test/perl/jdisc.spid.expected +++ /dev/null @@ -1,17 +0,0 @@ -[2013-01-25 12:46:51.180] INFO : 35172 - org.apache.felix.framework ServiceEvent REGISTERED -[2013-01-25 12:46:51.192] INFO : 35172 - jdisc_core.app-a BundleEvent INSTALLED -[2013-01-25 12:46:51.249] INFO : 35172 - jdisc_core.app-a BundleEvent RESOLVED -[2013-01-25 12:46:51.249] INFO : 35172 - jdisc_core.app-a BundleEvent STARTED -[2013-01-25 12:46:51.334] INFO : 35172 - jdisc_core.app-a BundleEvent STOPPED -[2013-01-25 12:46:51.335] INFO : 35172 - jdisc_core.app-a BundleEvent UNRESOLVED -[2013-01-25 12:46:51.335] INFO : 35172 - jdisc_core.app-a BundleEvent UNINSTALLED -[2013-01-25 12:46:51.376] INFO : 35172 - org.apache.felix.framework ServiceEvent REGISTERED -[2013-01-25 12:46:51.377] ERROR : 35172 - jdisc_core.app-a my_error -[2013-01-25 12:46:51.377] WARNING : 35172 - jdisc_core.app-a my_warning -[2013-01-25 12:46:51.377] INFO : 35172 - jdisc_core.app-a my_info -[2013-01-25 12:46:51.379] INFO : 35172 - jdisc_core.app-a BundleEvent INSTALLED -[2013-01-25 12:46:51.383] INFO : 35172 - jdisc_core.app-a BundleEvent RESOLVED -[2013-01-25 12:46:51.383] INFO : 35172 - jdisc_core.app-a BundleEvent STARTED -[2013-01-25 12:46:51.389] INFO : 35172 - jdisc_core.app-a BundleEvent STOPPED -[2013-01-25 12:46:51.389] INFO : 35172 - jdisc_core.app-a BundleEvent UNRESOLVED -[2013-01-25 12:46:51.390] INFO : 35172 - jdisc_core.app-a BundleEvent UNINSTALLED diff --git a/jdisc_core/src/test/perl/vespa-jdisc-logfmt-test.sh b/jdisc_core/src/test/perl/vespa-jdisc-logfmt-test.sh deleted file mode 100755 index e1c3d2a9dd4..00000000000 --- a/jdisc_core/src/test/perl/vespa-jdisc-logfmt-test.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -MYPATH=`dirname ${0}` -DIFF=/usr/bin/diff -LOGFMT=${1} - -if which perl &> /dev/null; then - echo "Running vespa-jdisc-logfmt test suite." -else - echo "Ignoring vespa-jdisc-logfmt test suite as there is no perl executable." - exit 0 -fi - -set -e -export TZ=CET -export VESPA_HOME=$(mktemp -d /tmp/mockup-vespahome-XXXXXX)/ -mkdir -p $VESPA_HOME/libexec/vespa -touch $VESPA_HOME/libexec/vespa/common-env.sh - -echo - -${LOGFMT} -h 2>&1 | ${DIFF} - ${MYPATH}/help.expected -${LOGFMT} -h -L event 2>&1 | ${DIFF} - ${MYPATH}/help.Levent.expected - -${LOGFMT} ${MYPATH}/jdisc.log 2>&1 | ${DIFF} - ${MYPATH}/jdisc.expected -${LOGFMT} -l all ${MYPATH}/jdisc.log 2>&1 | ${DIFF} - ${MYPATH}/jdisc.lall.expected -${LOGFMT} -l all,-info ${MYPATH}/jdisc.log 2>&1 | ${DIFF} - ${MYPATH}/jdisc.lall_info.expected -${LOGFMT} -s +pid ${MYPATH}/jdisc.log 2>&1 | ${DIFF} - ${MYPATH}/jdisc.spid.expected - -${LOGFMT} ${MYPATH}/vespa.log 2>&1 | ${DIFF} - ${MYPATH}/vespa.expected -${LOGFMT} -L event ${MYPATH}/vespa.log 2>&1 | ${DIFF} - ${MYPATH}/vespa.Levent.expected -${LOGFMT} -L event -l all ${MYPATH}/vespa.log 2>&1 | ${DIFF} - ${MYPATH}/vespa.Levent.lall.expected - -rm -r ${VESPA_HOME} -echo All tests passed. diff --git a/jdisc_core/src/test/perl/vespa.Levent.expected b/jdisc_core/src/test/perl/vespa.Levent.expected deleted file mode 100644 index 334ba5f5b28..00000000000 --- a/jdisc_core/src/test/perl/vespa.Levent.expected +++ /dev/null @@ -1,9 +0,0 @@ -[2012-11-27 14:22:48.120] INFO : configserver stdout ROOT = /home/vespa -[2012-11-27 14:22:48.232] INFO : configserver stdout Running without a pid file. -[2012-11-27 14:22:48.336] INFO : configserver stdout LANG = en_US.UTF-8 -[2012-11-27 14:22:48.393] INFO : configserver stdout env LD_PRELOAD=/home/vespa/libexec64/yjava_daemon_preload.so: /home/vespa/bin64/yjava_daemon -sentinel -rlimit_files 16384 -logdest /home/vespa/logs/vespa/yjava_daemon.out -loglevel error -jvm server -maxrestarts 0 -procs 1 -home /home/vespa/share/yjava_jdk/java -Djava.library.path=/home/vespa/lib64:/home/vespa/lib64 -Dvespa.log.control.dir=/home/vespa/var/db/vespa/logcontrol -XX:ThreadStackSize=512 -XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=128 -XX:MaxPermSize=512m -Dconfig.id=dir:/home/vespa/conf/configserver -Dyjava_remote_ip_servlet_filter.logLevel=DEBUG -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -Dcom.yahoo.protect.Process.forcedExitActive=true -Dzookeeperlogfile=/home/vespa/logs/vespa/zookeeper.log -Xms1536m -Xmx1536m -XX:MaxDirectMemorySize=267m -Djava.awt.headless=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/vespa/var/crash -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 -Djavax.net.ssl.keyStoreType=JKS -javaagent:/home/vespa/lib/jars/yjava_ysecure_agent.jar -Djdisc_core.config.file=/home/vespa/var/jdisc_core/config.properties -Djdisc.export.packages=yjava.security.ysecure,yjava.security.yca,yjava.security.yck,org.apache.velocity,org.apache.velocity.app,org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.runtime.log, -Djdisc.cache.path=/home/vespa/var/vespa/bundlecache/dir:_home_y_conf_configserver -Djdisc.debug.resources=false -Djdisc.bundle.path=/home/vespa/lib/jars -Djdisc.logger.enabled=false -Djdisc.logger.level=ALL -Djdisc.logger.tag=dir:/home/vespa/conf/configserver -user yahoo -cp /home/vespa/lib/jars/jdisc_core-with-dependencies.jar:lib/jars/yjava_bcookie.jar:lib/jars/yjava_bcookie_jni.jar:lib/jars/yjava_byauth.jar:lib/jars/yjava_cookie_data_servlet_filter.jar:lib/jars/yjava_daemon.jar:lib/jars/yjava_jmx_singleton_server.jar:lib/jars/yjava_remote_ip_servlet_filter.jar:lib/jars/yjava_resource_handler.jar:lib/jars/yjava_servlet.jar:lib/jars/yjava_servlet_filters.jar:lib/jars/yjava_yca.jar:lib/jars/yjava_yck.jar:lib/jars/yjava_yhdrs:lib/jars/yjava_yiv.jar:lib/jars/yjava_yiv_servlet.jar:lib/jars/yjava_ynet.jar:lib/jars/yjava_ysecure.jar:lib/jars/yjava_ysecure_agent.jar:lib/jars/yjava_ysecure_native.jar:share/jports/org_apache_velocity__velocity.jar:share/jports/commons_collections__commons_collections.jar:share/jports/commons_lang__commons_lang.jar: -ynet FILTER_YAHOO_ANY --wait-for-jvm-init 10 -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 -XX:OnOutOfMemoryError="kill -9 %p" com.yahoo.jdisc.core.BootstrapDaemon file:/home/vespa/lib/jars/container-disc-with-dependencies.jar -[2012-11-27 14:22:50.876] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Installing bundles from the latest application -[2012-11-27 14:22:50.884] INFO : configserver Container.com.yahoo.container.handler.BundleLoader Installing bundle from disk with reference 'file:/home/vespa/lib/jars/config-models/sherpa-config-model-plugin.jar' -[2012-11-27 14:22:50.889] INFO : configserver Container.com.yahoo.container.handler.BundleLoader Installing bundle from disk with reference 'file:/home/vespa/lib/jars/configserver-container-plugin.jar' -[2012-11-27 14:22:54.285] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Installing bundles from the latest application -[2012-11-27 14:22:57.489] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Switched to the latest deployed set of handlers, and dependent components, e.g. search chains, searchers and document processors. Application switch number: 0 diff --git a/jdisc_core/src/test/perl/vespa.Levent.lall.expected b/jdisc_core/src/test/perl/vespa.Levent.lall.expected deleted file mode 100644 index ef58eee7bfc..00000000000 --- a/jdisc_core/src/test/perl/vespa.Levent.lall.expected +++ /dev/null @@ -1,19 +0,0 @@ -[2012-11-27 14:22:48.091] EVENT : configserver runserver starting/1 name="/home/vespa/bin/vespa-start-container-daemon -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 (pid 18151)" -[2012-11-27 14:22:48.100] DEBUG : configserver qrs-start exporting: YELL_MA_EURO=INXIGHT -[2012-11-27 14:22:48.100] DEBUG : configserver qrs-start Not setting ulimit -v, no limit set. -[2012-11-27 14:22:48.120] INFO : configserver stdout ROOT = /home/vespa -[2012-11-27 14:22:48.232] INFO : configserver stdout Running without a pid file. -[2012-11-27 14:22:48.336] INFO : configserver stdout LANG = en_US.UTF-8 -[2012-11-27 14:22:48.393] INFO : configserver stdout env LD_PRELOAD=/home/vespa/libexec64/yjava_daemon_preload.so: /home/vespa/bin64/yjava_daemon -sentinel -rlimit_files 16384 -logdest /home/vespa/logs/vespa/yjava_daemon.out -loglevel error -jvm server -maxrestarts 0 -procs 1 -home /home/vespa/share/yjava_jdk/java -Djava.library.path=/home/vespa/lib64:/home/vespa/lib64 -Dvespa.log.control.dir=/home/vespa/var/db/vespa/logcontrol -XX:ThreadStackSize=512 -XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=128 -XX:MaxPermSize=512m -Dconfig.id=dir:/home/vespa/conf/configserver -Dyjava_remote_ip_servlet_filter.logLevel=DEBUG -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -Dcom.yahoo.protect.Process.forcedExitActive=true -Dzookeeperlogfile=/home/vespa/logs/vespa/zookeeper.log -Xms1536m -Xmx1536m -XX:MaxDirectMemorySize=267m -Djava.awt.headless=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/vespa/var/crash -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 -Djavax.net.ssl.keyStoreType=JKS -javaagent:/home/vespa/lib/jars/yjava_ysecure_agent.jar -Djdisc_core.config.file=/home/vespa/var/jdisc_core/config.properties -Djdisc.export.packages=yjava.security.ysecure,yjava.security.yca,yjava.security.yck,org.apache.velocity,org.apache.velocity.app,org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.runtime.log, -Djdisc.cache.path=/home/vespa/var/vespa/bundlecache/dir:_home_y_conf_configserver -Djdisc.debug.resources=false -Djdisc.bundle.path=/home/vespa/lib/jars -Djdisc.logger.enabled=false -Djdisc.logger.level=ALL -Djdisc.logger.tag=dir:/home/vespa/conf/configserver -user yahoo -cp /home/vespa/lib/jars/jdisc_core-with-dependencies.jar:lib/jars/yjava_bcookie.jar:lib/jars/yjava_bcookie_jni.jar:lib/jars/yjava_byauth.jar:lib/jars/yjava_cookie_data_servlet_filter.jar:lib/jars/yjava_daemon.jar:lib/jars/yjava_jmx_singleton_server.jar:lib/jars/yjava_remote_ip_servlet_filter.jar:lib/jars/yjava_resource_handler.jar:lib/jars/yjava_servlet.jar:lib/jars/yjava_servlet_filters.jar:lib/jars/yjava_yca.jar:lib/jars/yjava_yck.jar:lib/jars/yjava_yhdrs:lib/jars/yjava_yiv.jar:lib/jars/yjava_yiv_servlet.jar:lib/jars/yjava_ynet.jar:lib/jars/yjava_ysecure.jar:lib/jars/yjava_ysecure_agent.jar:lib/jars/yjava_ysecure_native.jar:share/jports/org_apache_velocity__velocity.jar:share/jports/commons_collections__commons_collections.jar:share/jports/commons_lang__commons_lang.jar: -ynet FILTER_YAHOO_ANY --wait-for-jvm-init 10 -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 -XX:OnOutOfMemoryError="kill -9 %p" com.yahoo.jdisc.core.BootstrapDaemon file:/home/vespa/lib/jars/container-disc-with-dependencies.jar -[2012-11-27 14:22:50.876] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Installing bundles from the latest application -[2012-11-27 14:22:50.884] INFO : configserver Container.com.yahoo.container.handler.BundleLoader Installing bundle from disk with reference 'file:/home/vespa/lib/jars/config-models/sherpa-config-model-plugin.jar' -[2012-11-27 14:22:50.889] INFO : configserver Container.com.yahoo.container.handler.BundleLoader Installing bundle from disk with reference 'file:/home/vespa/lib/jars/configserver-container-plugin.jar' -[2012-11-27 14:22:54.285] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Installing bundles from the latest application -[2012-11-27 14:22:57.430] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=requests value=0 -[2012-11-27 14:22:57.431] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=requestsCached value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=requestsNotCached value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=failedRequests value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=procTime value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=procTimeCached value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=procTimeNotCached value=0 -[2012-11-27 14:22:57.489] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Switched to the latest deployed set of handlers, and dependent components, e.g. search chains, searchers and document processors. Application switch number: 0 diff --git a/jdisc_core/src/test/perl/vespa.expected b/jdisc_core/src/test/perl/vespa.expected deleted file mode 100644 index 897a7084dae..00000000000 --- a/jdisc_core/src/test/perl/vespa.expected +++ /dev/null @@ -1,18 +0,0 @@ -Warning: unknown level 'event' in input -[2012-11-27 14:22:48.091] EVENT : configserver runserver starting/1 name="/home/vespa/bin/vespa-start-container-daemon -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 (pid 18151)" -[2012-11-27 14:22:48.120] INFO : configserver stdout ROOT = /home/vespa -[2012-11-27 14:22:48.232] INFO : configserver stdout Running without a pid file. -[2012-11-27 14:22:48.336] INFO : configserver stdout LANG = en_US.UTF-8 -[2012-11-27 14:22:48.393] INFO : configserver stdout env LD_PRELOAD=/home/vespa/libexec64/yjava_daemon_preload.so: /home/vespa/bin64/yjava_daemon -sentinel -rlimit_files 16384 -logdest /home/vespa/logs/vespa/yjava_daemon.out -loglevel error -jvm server -maxrestarts 0 -procs 1 -home /home/vespa/share/yjava_jdk/java -Djava.library.path=/home/vespa/lib64:/home/vespa/lib64 -Dvespa.log.control.dir=/home/vespa/var/db/vespa/logcontrol -XX:ThreadStackSize=512 -XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=128 -XX:MaxPermSize=512m -Dconfig.id=dir:/home/vespa/conf/configserver -Dyjava_remote_ip_servlet_filter.logLevel=DEBUG -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -Dcom.yahoo.protect.Process.forcedExitActive=true -Dzookeeperlogfile=/home/vespa/logs/vespa/zookeeper.log -Xms1536m -Xmx1536m -XX:MaxDirectMemorySize=267m -Djava.awt.headless=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/vespa/var/crash -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 -Djavax.net.ssl.keyStoreType=JKS -javaagent:/home/vespa/lib/jars/yjava_ysecure_agent.jar -Djdisc_core.config.file=/home/vespa/var/jdisc_core/config.properties -Djdisc.export.packages=yjava.security.ysecure,yjava.security.yca,yjava.security.yck,org.apache.velocity,org.apache.velocity.app,org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.runtime.log, -Djdisc.cache.path=/home/vespa/var/vespa/bundlecache/dir:_home_y_conf_configserver -Djdisc.debug.resources=false -Djdisc.bundle.path=/home/vespa/lib/jars -Djdisc.logger.enabled=false -Djdisc.logger.level=ALL -Djdisc.logger.tag=dir:/home/vespa/conf/configserver -user yahoo -cp /home/vespa/lib/jars/jdisc_core-with-dependencies.jar:lib/jars/yjava_bcookie.jar:lib/jars/yjava_bcookie_jni.jar:lib/jars/yjava_byauth.jar:lib/jars/yjava_cookie_data_servlet_filter.jar:lib/jars/yjava_daemon.jar:lib/jars/yjava_jmx_singleton_server.jar:lib/jars/yjava_remote_ip_servlet_filter.jar:lib/jars/yjava_resource_handler.jar:lib/jars/yjava_servlet.jar:lib/jars/yjava_servlet_filters.jar:lib/jars/yjava_yca.jar:lib/jars/yjava_yck.jar:lib/jars/yjava_yhdrs:lib/jars/yjava_yiv.jar:lib/jars/yjava_yiv_servlet.jar:lib/jars/yjava_ynet.jar:lib/jars/yjava_ysecure.jar:lib/jars/yjava_ysecure_agent.jar:lib/jars/yjava_ysecure_native.jar:share/jports/org_apache_velocity__velocity.jar:share/jports/commons_collections__commons_collections.jar:share/jports/commons_lang__commons_lang.jar: -ynet FILTER_YAHOO_ANY --wait-for-jvm-init 10 -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 -XX:OnOutOfMemoryError="kill -9 %p" com.yahoo.jdisc.core.BootstrapDaemon file:/home/vespa/lib/jars/container-disc-with-dependencies.jar -[2012-11-27 14:22:50.876] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Installing bundles from the latest application -[2012-11-27 14:22:50.884] INFO : configserver Container.com.yahoo.container.handler.BundleLoader Installing bundle from disk with reference 'file:/home/vespa/lib/jars/config-models/sherpa-config-model-plugin.jar' -[2012-11-27 14:22:50.889] INFO : configserver Container.com.yahoo.container.handler.BundleLoader Installing bundle from disk with reference 'file:/home/vespa/lib/jars/configserver-container-plugin.jar' -[2012-11-27 14:22:54.285] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Installing bundles from the latest application -[2012-11-27 14:22:57.430] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=requests value=0 -[2012-11-27 14:22:57.431] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=requestsCached value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=requestsNotCached value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=failedRequests value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=procTime value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=procTimeCached value=0 -[2012-11-27 14:22:57.432] EVENT : configserver Container.com.yahoo.statistics.Counter count/1 name=procTimeNotCached value=0 -[2012-11-27 14:22:57.489] INFO : configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi Switched to the latest deployed set of handlers, and dependent components, e.g. search chains, searchers and document processors. Application switch number: 0 diff --git a/jdisc_core/src/test/perl/vespa.log b/jdisc_core/src/test/perl/vespa.log deleted file mode 100644 index 36210bdb798..00000000000 --- a/jdisc_core/src/test/perl/vespa.log +++ /dev/null @@ -1,19 +0,0 @@ -1354022568.091108 example.yahoo.com 18150/38735 configserver runserver event starting/1 name="/home/vespa/bin/vespa-start-container-daemon -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 (pid 18151)" -1354022568.100151 example.yahoo.com 18151 configserver qrs-start debug exporting: YELL_MA_EURO=INXIGHT -1354022568.100217 example.yahoo.com 18151 configserver qrs-start debug Not setting ulimit -v, no limit set. -1354022568.120716 example.yahoo.com 18151 configserver stdout info ROOT = /home/vespa -1354022568.232852 example.yahoo.com 18151 configserver stdout info Running without a pid file. -1354022568.336341 example.yahoo.com 18151 configserver stdout info LANG = en_US.UTF-8 -1354022568.393706 example.yahoo.com 18151 configserver stdout info env LD_PRELOAD=/home/vespa/libexec64/yjava_daemon_preload.so: /home/vespa/bin64/yjava_daemon -sentinel -rlimit_files 16384 -logdest /home/vespa/logs/vespa/yjava_daemon.out -loglevel error -jvm server -maxrestarts 0 -procs 1 -home /home/vespa/share/yjava_jdk/java -Djava.library.path=/home/vespa/lib64:/home/vespa/lib64 -Dvespa.log.control.dir=/home/vespa/var/db/vespa/logcontrol -XX:ThreadStackSize=512 -XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=128 -XX:MaxPermSize=512m -Dconfig.id=dir:/home/vespa/conf/configserver -Dyjava_remote_ip_servlet_filter.logLevel=DEBUG -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger -Dcom.yahoo.protect.Process.forcedExitActive=true -Dzookeeperlogfile=/home/vespa/logs/vespa/zookeeper.log -Xms1536m -Xmx1536m -XX:MaxDirectMemorySize=267m -Djava.awt.headless=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/vespa/var/crash -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 -Djavax.net.ssl.keyStoreType=JKS -javaagent:/home/vespa/lib/jars/yjava_ysecure_agent.jar -Djdisc_core.config.file=/home/vespa/var/jdisc_core/config.properties -Djdisc.export.packages=yjava.security.ysecure,yjava.security.yca,yjava.security.yck,org.apache.velocity,org.apache.velocity.app,org.apache.velocity.context,org.apache.velocity.runtime,org.apache.velocity.runtime.log, -Djdisc.cache.path=/home/vespa/var/vespa/bundlecache/dir:_home_y_conf_configserver -Djdisc.debug.resources=false -Djdisc.bundle.path=/home/vespa/lib/jars -Djdisc.logger.enabled=false -Djdisc.logger.level=ALL -Djdisc.logger.tag=dir:/home/vespa/conf/configserver -user yahoo -cp /home/vespa/lib/jars/jdisc_core-with-dependencies.jar:lib/jars/yjava_bcookie.jar:lib/jars/yjava_bcookie_jni.jar:lib/jars/yjava_byauth.jar:lib/jars/yjava_cookie_data_servlet_filter.jar:lib/jars/yjava_daemon.jar:lib/jars/yjava_jmx_singleton_server.jar:lib/jars/yjava_remote_ip_servlet_filter.jar:lib/jars/yjava_resource_handler.jar:lib/jars/yjava_servlet.jar:lib/jars/yjava_servlet_filters.jar:lib/jars/yjava_yca.jar:lib/jars/yjava_yck.jar:lib/jars/yjava_yhdrs:lib/jars/yjava_yiv.jar:lib/jars/yjava_yiv_servlet.jar:lib/jars/yjava_ynet.jar:lib/jars/yjava_ysecure.jar:lib/jars/yjava_ysecure_agent.jar:lib/jars/yjava_ysecure_native.jar:share/jports/org_apache_velocity__velocity.jar:share/jports/commons_collections__commons_collections.jar:share/jports/commons_lang__commons_lang.jar: -ynet FILTER_YAHOO_ANY --wait-for-jvm-init 10 -Dzookeeper.jmx.log4j.disable=true -Dconfigsources=tcp/localhost:19070 -XX:OnOutOfMemoryError="kill -9 %p" com.yahoo.jdisc.core.BootstrapDaemon file:/home/vespa/lib/jars/container-disc-with-dependencies.jar -1354022570.876 example.yahoo.com 18151/1 configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi info Installing bundles from the latest application -1354022570.884 example.yahoo.com 18151/1 configserver Container.com.yahoo.container.handler.BundleLoader info Installing bundle from disk with reference 'file:/home/vespa/lib/jars/config-models/sherpa-config-model-plugin.jar' -1354022570.889 example.yahoo.com 18151/1 configserver Container.com.yahoo.container.handler.BundleLoader info Installing bundle from disk with reference 'file:/home/vespa/lib/jars/configserver-container-plugin.jar' -1354022574.285 example.yahoo.com 18151/1 configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi info Installing bundles from the latest application -1354022577.430 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=requests value=0 -1354022577.431 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=requestsCached value=0 -1354022577.432 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=requestsNotCached value=0 -1354022577.432 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=failedRequests value=0 -1354022577.432 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=procTime value=0 -1354022577.432 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=procTimeCached value=0 -1354022577.432 example.yahoo.com 18151/1 configserver Container.com.yahoo.statistics.Counter event count/1 name=procTimeNotCached value=0 -1354022577.489 example.yahoo.com 18151/1 configserver Container.com.yahoo.container.handler.config.HandlersConfigurerDi info Switched to the latest deployed set of handlers, and dependent components, e.g. search chains, searchers and document processors. Application switch number: 0 |