diff options
author | Eirik Nygaard <eirik@ngrd.no> | 2022-11-07 09:08:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-07 09:08:39 +0100 |
commit | 8b901ec4042cd4c6e0813892bfe574df54310e7c (patch) | |
tree | 8fd117c69208afeb30a1bcfd04b5228940b9b9d4 /node-admin | |
parent | 1268204421c9f9e10ed4e1ce6aaa38cea941d735 (diff) |
Revert "Revert "Revert "Move $VESPA_HOME/tmp to $VESPA_HOME/var/tmp [run-systemtest]"""
Diffstat (limited to 'node-admin')
2 files changed, 6 insertions, 6 deletions
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 43b4df7415e..3a0cd412a2e 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("var/tmp/vespa-service-dump-" + request.getCreatedMillisOrNull()); + ContainerPath directory = context.paths().underVespaHome("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 5366156cfbe..081f0038e06 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/var/tmp"); + private final Path tmpDirectory = fileSystem.getPath("/data/vespa/storage/host-1/opt/vespa/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/var/tmp/vespa-service-dump-1600000000000/perf-record.bin", + context, context.users().vespa(), "perf", "record", "-g", "--output=/opt/vespa/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/var/tmp/vespa-service-dump-1600000000000/perf-record.bin" + - " > /opt/vespa/var/tmp/vespa-service-dump-1600000000000/perf-report.txt"); + 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"); 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/var/tmp/vespa-service-dump-1600000000000/recording.jfr", "duration=30s"); + "filename=/opt/vespa/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," + |