Assume core bin path is under VESPA_HOME if relative

2 files changed, 22 insertions, 6 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java
index 5d4628b41b6..5ad51e656ce 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java
@@ -108,7 +108,7 @@ public class CoreCollector {
         }
 
         try {
-            String binPath = readBinPath(context, coredumpPath);
+            String binPath = context.paths().underVespaHome("").resolve(readBinPath(context, coredumpPath)).pathInContainer();
             metadata.setType(CoreDumpMetadata.Type.CORE_DUMP).setBinPath(binPath);
 
             if (Path.of(binPath).getFileName().toString().equals("java")) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
index b4a35d6012c..6d7d31e5a6c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
@@ -57,11 +57,6 @@ public class CoreCollectorTest {
         assertEquals(TEST_BIN_PATH, coreCollector.readBinPath(context, TEST_CORE_PATH));
 
         mockExec(cmd,
-                "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from " +
-                        "'/usr/bin/program'");
-        assertEquals(TEST_BIN_PATH, coreCollector.readBinPath(context, TEST_CORE_PATH));
-
-        mockExec(cmd,
                 "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, " +
                         "from 'program', real uid: 0, effective uid: 0, real gid: 0, effective gid: 0, " +
                         "execfn: '/usr/bin/program', platform: 'x86_64");
@@ -159,6 +154,27 @@ public class CoreCollectorTest {
     }
 
     @Test
+    void collectsDataRelativePath() {
+        mockExec(new String[]{"file", TEST_CORE_PATH.pathInContainer()},
+                "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from 'sbin/distributord-bin'");
+        String absolutePath = "/opt/vespa/sbin/distributord-bin";
+        mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none",
+                        "-ex", "bt", "-batch", absolutePath, "/tmp/core.1234"},
+                String.join("\n", GDB_BACKTRACE));
+        mockExec(new String[]{GDB_PATH_RHEL8, "-n", "-ex", "set print frame-arguments none",
+                        "-ex", "thread apply all bt", "-batch", absolutePath, "/tmp/core.1234"},
+                String.join("\n", GDB_BACKTRACE));
+
+        var expected = new CoreDumpMetadata()
+                .setBinPath(absolutePath)
+                .setCreated(CORE_CREATED)
+                .setType(CoreDumpMetadata.Type.CORE_DUMP)
+                .setBacktrace(GDB_BACKTRACE)
+                .setBacktraceAllThreads(GDB_BACKTRACE);
+        assertEquals(expected, coreCollector.collect(context, TEST_CORE_PATH));
+    }
+
+    @Test
     void collectsPartialIfBacktraceFailsTest() {
         mockExec(new String[]{"file", TEST_CORE_PATH.pathInContainer()},
                 "/tmp/core.1234: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from " +