1 files changed, 16 insertions, 16 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/JvmDumper.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/JvmDumper.java
index cf206918568..8b6ca1384e9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/JvmDumper.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/JvmDumper.java
@@ -1,9 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.maintenance.servicedump;
 
+import com.yahoo.vespa.hosted.node.admin.task.util.fs.ContainerPath;
 import com.yahoo.yolean.concurrent.Sleeper;
 
-import java.nio.file.Path;
 import java.time.Duration;
 import java.util.List;
 
@@ -22,12 +22,12 @@ class JvmDumper {
 
         @Override
         public List<Artifact> produceArtifacts(Context ctx) {
-            Path heapDumpFile = ctx.outputDirectoryInNode().resolve("jvm-heap-dump.bin");
+            ContainerPath heapDumpFile = ctx.outputContainerPath().resolve("jvm-heap-dump.bin");
             List<String> cmd = List.of(
-                    "jmap", "-dump:live,format=b,file=" + heapDumpFile, Integer.toString(ctx.servicePid()));
+                    "jmap", "-dump:live,format=b,file=" + heapDumpFile.pathInContainer(), Integer.toString(ctx.servicePid()));
             ctx.executeCommandInNode(cmd, true);
             return List.of(
-                    Artifact.newBuilder().classification(CONFIDENTIAL).fileInNode(heapDumpFile).compressOnUpload().build());
+                    Artifact.newBuilder().classification(CONFIDENTIAL).file(heapDumpFile).compressOnUpload().build());
         }
     }
 
@@ -37,10 +37,10 @@ class JvmDumper {
 
         @Override
         public List<Artifact> produceArtifacts(Context ctx) {
-            Path jmapReport = ctx.outputDirectoryInNode().resolve("jvm-jmap.txt");
-            List<String> cmd = List.of("bash", "-c", "jhsdb jmap --heap --pid " + ctx.servicePid() + " > " + jmapReport);
+            ContainerPath jmapReport = ctx.outputContainerPath().resolve("jvm-jmap.txt");
+            List<String> cmd = List.of("bash", "-c", "jhsdb jmap --heap --pid " + ctx.servicePid() + " > " + jmapReport.pathInContainer());
             ctx.executeCommandInNode(cmd, true);
-            return List.of(Artifact.newBuilder().classification(INTERNAL).fileInNode(jmapReport).build());
+            return List.of(Artifact.newBuilder().classification(INTERNAL).file(jmapReport).build());
         }
     }
 
@@ -50,10 +50,10 @@ class JvmDumper {
 
         @Override
         public List<Artifact> produceArtifacts(Context ctx) {
-            Path jstatReport = ctx.outputDirectoryInNode().resolve("jvm-jstat.txt");
-            List<String> cmd = List.of("bash", "-c", "jstat -gcutil " + ctx.servicePid() + " > " + jstatReport);
+            ContainerPath jstatReport = ctx.outputContainerPath().resolve("jvm-jstat.txt");
+            List<String> cmd = List.of("bash", "-c", "jstat -gcutil " + ctx.servicePid() + " > " + jstatReport.pathInContainer());
             ctx.executeCommandInNode(cmd, true);
-            return List.of(Artifact.newBuilder().classification(INTERNAL).fileInNode(jstatReport).build());
+            return List.of(Artifact.newBuilder().classification(INTERNAL).file(jstatReport).build());
         }
     }
 
@@ -63,9 +63,9 @@ class JvmDumper {
 
         @Override
         public List<Artifact> produceArtifacts(Context ctx) {
-            Path jstackReport = ctx.outputDirectoryInNode().resolve("jvm-jstack.txt");
-            ctx.executeCommandInNode(List.of("bash", "-c", "jstack " + ctx.servicePid() + " > " + jstackReport), true);
-            return List.of(Artifact.newBuilder().classification(INTERNAL).fileInNode(jstackReport).build());
+            ContainerPath jstackReport = ctx.outputContainerPath().resolve("jvm-jstack.txt");
+            ctx.executeCommandInNode(List.of("bash", "-c", "jstack " + ctx.servicePid() + " > " + jstackReport.pathInContainer()), true);
+            return List.of(Artifact.newBuilder().classification(INTERNAL).file(jstackReport).build());
         }
     }
 
@@ -80,9 +80,9 @@ class JvmDumper {
         @Override
         public List<Artifact> produceArtifacts(ArtifactProducer.Context ctx) {
             int seconds = (int) (ctx.options().duration().orElse(30.0));
-            Path outputFile = ctx.outputDirectoryInNode().resolve("recording.jfr");
+            ContainerPath outputFile = ctx.outputContainerPath().resolve("recording.jfr");
             List<String> startCommand = List.of("jcmd", Integer.toString(ctx.servicePid()), "JFR.start", "name=host-admin",
-                    "path-to-gc-roots=true", "settings=profile", "filename=" + outputFile, "duration=" + seconds + "s");
+                    "path-to-gc-roots=true", "settings=profile", "filename=" + outputFile.pathInContainer(), "duration=" + seconds + "s");
             ctx.executeCommandInNode(startCommand, true);
             sleeper.sleep(Duration.ofSeconds(seconds).plusSeconds(1));
             int maxRetries = 10;
@@ -92,7 +92,7 @@ class JvmDumper {
                         .anyMatch(l -> l.contains("name=host-admin") && l.contains("running"));
                 if (!stillRunning) {
                     Artifact a = Artifact.newBuilder()
-                            .classification(CONFIDENTIAL).fileInNode(outputFile).compressOnUpload().build();
+                            .classification(CONFIDENTIAL).file(outputFile).compressOnUpload().build();
                     return List.of(a);
                 }
                 sleeper.sleep(Duration.ofSeconds(1));