diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-08-31 16:39:25 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-08-31 16:39:29 +0200 |
| commit | 7c05cb00c31bb1ba21ba5446ec88d7f141691de3 (patch) | |
| tree | 5c604bd2e7ddc65cf0a44db05662109b4a7cc651 /node-admin | |
| parent | 5963ab60ccbd1df1597d9f2a9a8b3c5cbf3a11bd (diff) | |
Don't hardcode path to Vespa home
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java | 7 |
1 files changed, 4 insertions, 3 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 d2cf652a9d9..ea2f5e1ace6 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 @@ -29,7 +29,6 @@ import java.util.stream.Collectors; public class VespaServiceDumperImpl implements VespaServiceDumper { private static final Logger log = Logger.getLogger(VespaServiceDumperImpl.class.getName()); - private static final String DIRECTORY_IN_NODE = "/opt/vespa/tmp/vespa-service-dump"; private final ContainerOperations container; private final SyncClient syncClient; @@ -69,11 +68,13 @@ public class VespaServiceDumperImpl implements VespaServiceDumper { context.log(log, Level.FINE, "Creating dump for " + configId + " requested at " + Instant.ofEpochMilli(request.getCreatedMillisOrNull())); storeReport(context, createStartedReport(request, startedAt)); - Path directoryOnHost = context.pathOnHostFromPathInNode(DIRECTORY_IN_NODE); + Path directoryInNode = context.pathInNodeUnderVespaHome("tmp/vespa-service-dump"); + Path directoryOnHost = context.pathOnHostFromPathInNode(directoryInNode); Files.deleteIfExists(directoryOnHost); Files.createDirectory(directoryOnHost); + Path vespaJvmDumper = context.pathInNodeUnderVespaHome("bin/vespa-jvm-dumper"); CommandResult result = container.executeCommandInContainerAsRoot( - context, "/opt/vespa/bin/vespa-jvm-dumper", configId, DIRECTORY_IN_NODE); + context, vespaJvmDumper.toString(), configId, directoryInNode.toString()); context.log(log, Level.FINE, "vespa-jvm-dumper exit code: " + result.getExitCode()); context.log(log, Level.FINE, "vespa-jvm-dumper output: " + result.getOutput()); if (result.getExitCode() > 0) { |