From 24138b41c3cc7ba82f33139faf2ed6eb985bf5d5 Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Mon, 7 Nov 2022 09:10:40 +0100 Subject: Revert "Revert "Revert "Revert "Move $VESPA_HOME/tmp to $VESPA_HOME/var/tmp [run-systemtest]"""" --- config-proxy/src/main/sh/vespa-config-ctl.sh | 2 +- configserver/src/main/sh/start-configserver | 2 +- container-disc/src/main/sh/vespa-start-container-daemon.sh | 2 +- dist/vespa.spec | 5 +++-- logserver/bin/logserver-start.sh | 2 +- .../admin/maintenance/servicedump/VespaServiceDumperImpl.java | 2 +- .../maintenance/servicedump/VespaServiceDumperImplTest.java | 10 +++++----- .../container/standalone/StandaloneContainerApplication.java | 2 +- vespabase/CMakeLists.txt | 2 +- vespabase/src/rhel-prestart.sh | 4 ++-- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index 63aaf11280f..be141561b07 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -122,7 +122,7 @@ case $1 in java ${jvmopts} \ -XX:+ExitOnOutOfMemoryError $(getJavaOptionsIPV46) \ -Dproxyconfigsources="${configsources}" \ - -Djava.io.tmpdir=${VESPA_HOME}/tmp \ + -Djava.io.tmpdir=${VESPA_HOME}/var/tmp \ ${userargs} \ -XX:ActiveProcessorCount=2 \ -cp $cp com.yahoo.vespa.config.proxy.ProxyServer 19090 diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 8f515a4c309..97ccae9125f 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -182,7 +182,7 @@ vespa-run-as-vespa-user vespa-runserver -s ${VESPA_SERVICE_NAME} -r 30 -p $pidfi --add-opens=java.base/java.nio=ALL-UNNAMED \ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \ --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \ - -Djava.io.tmpdir=${VESPA_HOME}/tmp \ + -Djava.io.tmpdir=${VESPA_HOME}/var/tmp \ -Djava.library.path=${VESPA_HOME}/lib64 \ -Djava.security.properties=${VESPA_HOME}/conf/vespa/java.security.override \ -Djava.awt.headless=true \ 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 09a873f06f9..bd218ba176d 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -274,7 +274,7 @@ exec $numactlcmd $envcmd java \ --add-opens=java.base/java.nio=ALL-UNNAMED \ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \ --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \ - -Djava.io.tmpdir="${VESPA_HOME}/tmp" \ + -Djava.io.tmpdir="${VESPA_HOME}/var/tmp" \ -Djava.library.path="${VESPA_HOME}/lib64" \ -Djava.security.properties=${VESPA_HOME}/conf/vespa/java.security.override \ -Djava.awt.headless=true \ diff --git a/dist/vespa.spec b/dist/vespa.spec index 437daf3f4e2..38cc4bef791 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -551,6 +551,7 @@ cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa-configserver.service %{build %endif ln -s /usr/lib/jvm/jre-17-openjdk %{buildroot}/%{_prefix}/jdk +ln -s %{_prefix}/var/tmp %{buildroot}/%{_prefix}/tmp %clean rm -rf $RPM_BUILD_ROOT @@ -690,8 +691,6 @@ fi %{_prefix}/man %{_prefix}/sbin %{_prefix}/share -%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/tmp -%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/tmp/vespa %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/crash %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db @@ -707,6 +706,8 @@ fi %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/tmp %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/jdisc_container %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/run +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/tmp +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/tmp/vespa %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/application %dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/bundlecache diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index d37a2f31720..942120ceb21 100755 --- a/logserver/bin/logserver-start.sh +++ b/logserver/bin/logserver-start.sh @@ -81,7 +81,7 @@ cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } heap_min=32 heap_max=256 -addopts="-server -Xms${heap_min}m -Xmx${heap_max}m -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:ActiveProcessorCount=2 -XX:-OmitStackTraceInFastThrow -Djava.io.tmpdir=${VESPA_HOME}/tmp" +addopts="-server -Xms${heap_min}m -Xmx${heap_max}m -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:ActiveProcessorCount=2 -XX:-OmitStackTraceInFastThrow -Djava.io.tmpdir=${VESPA_HOME}/var/tmp" oomopt="-XX:+ExitOnOutOfMemoryError" diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java index 3a0cd412a2e..43b4df7415e 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java @@ -98,7 +98,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper { handleFailure(context, request, startedAt, "No artifacts requested"); return; } - ContainerPath directory = context.paths().underVespaHome("tmp/vespa-service-dump-" + request.getCreatedMillisOrNull()); + ContainerPath directory = context.paths().underVespaHome("var/tmp/vespa-service-dump-" + request.getCreatedMillisOrNull()); UnixPath unixPathDirectory = new UnixPath(directory); try { context.log(log, Level.INFO, diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java index 081f0038e06..5366156cfbe 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java @@ -44,7 +44,7 @@ class VespaServiceDumperImplTest { private static final String HOSTNAME = "host-1.domain.tld"; private final FileSystem fileSystem = TestFileSystem.create(); - private final Path tmpDirectory = fileSystem.getPath("/data/vespa/storage/host-1/opt/vespa/tmp"); + private final Path tmpDirectory = fileSystem.getPath("/data/vespa/storage/host-1/opt/vespa/var/tmp"); @BeforeEach void create_tmp_directory() throws IOException { @@ -84,11 +84,11 @@ class VespaServiceDumperImplTest { verify(operations).executeCommandInContainer( context, context.users().vespa(), "/opt/vespa/libexec/vespa/find-pid", "default/container.1"); verify(operations).executeCommandInContainer( - context, context.users().vespa(), "perf", "record", "-g", "--output=/opt/vespa/tmp/vespa-service-dump-1600000000000/perf-record.bin", + context, context.users().vespa(), "perf", "record", "-g", "--output=/opt/vespa/var/tmp/vespa-service-dump-1600000000000/perf-record.bin", "--pid=12345", "sleep", "45"); verify(operations).executeCommandInContainer( - context, context.users().vespa(), "bash", "-c", "perf report --input=/opt/vespa/tmp/vespa-service-dump-1600000000000/perf-record.bin" + - " > /opt/vespa/tmp/vespa-service-dump-1600000000000/perf-report.txt"); + context, context.users().vespa(), "bash", "-c", "perf report --input=/opt/vespa/var/tmp/vespa-service-dump-1600000000000/perf-record.bin" + + " > /opt/vespa/var/tmp/vespa-service-dump-1600000000000/perf-report.txt"); String expectedJson = "{\"createdMillis\":1600000000000,\"startedAt\":1600001000000,\"completedAt\":1600001000000," + "\"location\":\"s3://uri-1/tenant1/service-dump/default-container-1-1600000000000/\"," + @@ -127,7 +127,7 @@ class VespaServiceDumperImplTest { context, context.users().vespa(), "/opt/vespa/libexec/vespa/find-pid", "default/container.1"); verify(operations).executeCommandInContainer( context, context.users().vespa(), "jcmd", "12345", "JFR.start", "name=host-admin", "path-to-gc-roots=true", "settings=profile", - "filename=/opt/vespa/tmp/vespa-service-dump-1600000000000/recording.jfr", "duration=30s"); + "filename=/opt/vespa/var/tmp/vespa-service-dump-1600000000000/recording.jfr", "duration=30s"); verify(operations).executeCommandInContainer(context, context.users().vespa(), "jcmd", "12345", "JFR.check", "name=host-admin"); String expectedJson = "{\"createdMillis\":1600000000000,\"startedAt\":1600001000000," + diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java index a677c69cb79..f80cdbed900 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java @@ -67,7 +67,7 @@ public class StandaloneContainerApplication implements Application { public static final Named APPLICATION_PATH_NAME = Names.named(APPLICATION_LOCATION_INSTALL_VARIABLE); public static final Named CONFIG_MODEL_REPO_NAME = Names.named("ConfigModelRepo"); - private static final String DEFAULT_TMP_BASE_DIR = Defaults.getDefaults().underVespaHome("tmp"); + private static final String DEFAULT_TMP_BASE_DIR = Defaults.getDefaults().underVespaHome("var/tmp"); private static final String TMP_DIR_NAME = "standalone_container"; private static final StaticConfigDefinitionRepo configDefinitionRepo = new StaticConfigDefinitionRepo(); diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index ce19dbb56b3..e72f02d5eeb 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -23,7 +23,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/conf/default-env.txt DESTINATION conf/ install(DIRECTORY DESTINATION logs/vespa) install(DIRECTORY DESTINATION logs/vespa/access) -install(DIRECTORY DESTINATION tmp/vespa) install(DIRECTORY DESTINATION var/crash) install(DIRECTORY DESTINATION var/db/vespa) install(DIRECTORY DESTINATION var/db/vespa/config_server) @@ -36,6 +35,7 @@ install(DIRECTORY DESTINATION var/db/vespa/search) install(DIRECTORY DESTINATION var/db/vespa/tmp) install(DIRECTORY DESTINATION var/jdisc_container) install(DIRECTORY DESTINATION var/run) +install(DIRECTORY DESTINATION var/tmp/vespa) install(DIRECTORY DESTINATION var/vespa) install(DIRECTORY DESTINATION var/vespa/application) install(DIRECTORY DESTINATION var/vespa/bundlecache) diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index d6f53046b47..358e9ceccdb 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -124,8 +124,6 @@ fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/access fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/configserver fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/search -fixdir ${VESPA_USER} ${VESPA_GROUP} 755 tmp -fixdir ${VESPA_USER} ${VESPA_GROUP} 755 tmp/vespa fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/crash fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db @@ -141,6 +139,8 @@ fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/search fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/tmp fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/jdisc_container fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/run +fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/tmp +fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/tmp/vespa fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/application fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/bundlecache -- cgit v1.2.3