Set and propagate coredump type

4 files changed, 35 insertions, 22 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java
index 7367a254b4a..eceb83a6cba 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoreDumpMetadata.java
@@ -12,6 +12,9 @@ import java.util.Optional;
  * @author hakonhall
  */
 public class CoreDumpMetadata {
+    public enum Type { CORE_DUMP, JVM_HEAP, OOM }
+
+    private Type type;
     private String binPath;
     private List<String> backtrace;
     private List<String> backtraceAllThreads;
@@ -24,30 +27,33 @@ public class CoreDumpMetadata {
 
     public CoreDumpMetadata() {}
 
-    public Optional<String> binPath() { return Optional.ofNullable(binPath); };
-    public Optional<List<String>> backtrace() { return Optional.ofNullable(backtrace); };
-    public Optional<List<String>> backtraceAllThreads() { return Optional.ofNullable(backtraceAllThreads); };
-    public Optional<Path> coredumpPath() { return Optional.ofNullable(coreDumpPath); };
+    public Optional<Type> type() { return Optional.ofNullable(type); }
+    public Optional<String> binPath() { return Optional.ofNullable(binPath); }
+    public Optional<List<String>> backtrace() { return Optional.ofNullable(backtrace); }
+    public Optional<List<String>> backtraceAllThreads() { return Optional.ofNullable(backtraceAllThreads); }
+    public Optional<Path> coredumpPath() { return Optional.ofNullable(coreDumpPath); }
     public Optional<String> decryptionToken() { return Optional.ofNullable(decryptionToken); }
-    public Optional<String> kernelVersion() { return Optional.ofNullable(kernelVersion); };
-    public Optional<String> cpuMicrocodeVersion() { return Optional.ofNullable(cpuMicrocodeVersion); };
-    public Optional<DockerImage> dockerImage() { return Optional.ofNullable(dockerImage); };
-    public Optional<String> vespaVersion() { return Optional.ofNullable(vespaVersion); };
+    public Optional<String> kernelVersion() { return Optional.ofNullable(kernelVersion); }
+    public Optional<String> cpuMicrocodeVersion() { return Optional.ofNullable(cpuMicrocodeVersion); }
+    public Optional<DockerImage> dockerImage() { return Optional.ofNullable(dockerImage); }
+    public Optional<String> vespaVersion() { return Optional.ofNullable(vespaVersion); }
 
-    public CoreDumpMetadata setBinPath(String binPath) { this.binPath = binPath; return this; };
-    public CoreDumpMetadata setBacktrace(List<String> backtrace) { this.backtrace = backtrace; return this; };
-    public CoreDumpMetadata setBacktraceAllThreads(List<String> backtraceAllThreads) { this.backtraceAllThreads = backtraceAllThreads; return this; };
-    public CoreDumpMetadata setCoreDumpPath(Path coreDumpPath) { this.coreDumpPath = coreDumpPath; return this; };
+    public CoreDumpMetadata setType(Type type) { this.type = type; return this; }
+    public CoreDumpMetadata setBinPath(String binPath) { this.binPath = binPath; return this; }
+    public CoreDumpMetadata setBacktrace(List<String> backtrace) { this.backtrace = backtrace; return this; }
+    public CoreDumpMetadata setBacktraceAllThreads(List<String> backtraceAllThreads) { this.backtraceAllThreads = backtraceAllThreads; return this; }
+    public CoreDumpMetadata setCoreDumpPath(Path coreDumpPath) { this.coreDumpPath = coreDumpPath; return this; }
     public CoreDumpMetadata setDecryptionToken(String decryptionToken) { this.decryptionToken = decryptionToken; return this; }
-    public CoreDumpMetadata setKernelVersion(String kernelVersion) { this.kernelVersion = kernelVersion; return this; };
-    public CoreDumpMetadata setCpuMicrocodeVersion(String cpuMicrocodeVersion) { this.cpuMicrocodeVersion = cpuMicrocodeVersion; return this; };
-    public CoreDumpMetadata setDockerImage(DockerImage dockerImage) { this.dockerImage = dockerImage; return this; };
-    public CoreDumpMetadata setVespaVersion(String vespaVersion) { this.vespaVersion = vespaVersion; return this; };
+    public CoreDumpMetadata setKernelVersion(String kernelVersion) { this.kernelVersion = kernelVersion; return this; }
+    public CoreDumpMetadata setCpuMicrocodeVersion(String cpuMicrocodeVersion) { this.cpuMicrocodeVersion = cpuMicrocodeVersion; return this; }
+    public CoreDumpMetadata setDockerImage(DockerImage dockerImage) { this.dockerImage = dockerImage; return this; }
+    public CoreDumpMetadata setVespaVersion(String vespaVersion) { this.vespaVersion = vespaVersion; return this; }
 
     @Override
     public String toString() {
         return "CoreDumpMetadata{" +
-               "binPath=" + binPath +
+               "type=" + type +
+               ", binPath=" + binPath +
                ", backtrace=" + backtrace +
                ", backtraceAllThreads=" + backtraceAllThreads +
                ", coreDumpPath=" + coreDumpPath +
@@ -64,7 +70,8 @@ public class CoreDumpMetadata {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         CoreDumpMetadata metadata = (CoreDumpMetadata) o;
-        return Objects.equals(binPath, metadata.binPath) &&
+        return type == metadata.type &&
+               Objects.equals(binPath, metadata.binPath) &&
                Objects.equals(backtrace, metadata.backtrace) &&
                Objects.equals(backtraceAllThreads, metadata.backtraceAllThreads) &&
                Objects.equals(coreDumpPath, metadata.coreDumpPath) &&
@@ -77,7 +84,7 @@ public class CoreDumpMetadata {
 
     @Override
     public int hashCode() {
-        return Objects.hash(binPath, backtrace, backtraceAllThreads, coreDumpPath, decryptionToken, kernelVersion,
+        return Objects.hash(type, binPath, backtrace, backtraceAllThreads, coreDumpPath, decryptionToken, kernelVersion,
                             cpuMicrocodeVersion, dockerImage, vespaVersion);
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/bindings/ReportCoreDumpRequest.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/bindings/ReportCoreDumpRequest.java
index 27cf28b8e1e..cf717aff787 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/bindings/ReportCoreDumpRequest.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/bindings/ReportCoreDumpRequest.java
@@ -31,6 +31,7 @@ public class ReportCoreDumpRequest {
 
     public List<String> backtrace;
     public List<String> backtrace_all_threads;
+    public String type;
     public String bin_path;
     public String coredump_path;
     public String cpu_microcode_version;
@@ -44,6 +45,7 @@ public class ReportCoreDumpRequest {
     /** Fill this from metadata and return this. */
     @JsonIgnore
     public ReportCoreDumpRequest fillFrom(CoreDumpMetadata metadata) {
+        metadata.type().ifPresent(type -> this.type = type.name());
         metadata.binPath().ifPresent(binPath -> this.bin_path = binPath);
         metadata.backtrace().ifPresent(backtrace -> this.backtrace = List.copyOf(backtrace));
         metadata.backtraceAllThreads().ifPresent(backtraceAllThreads -> this.backtrace_all_threads = List.copyOf(backtraceAllThreads));
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 28773767d24..4761b6da421 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
@@ -99,14 +99,15 @@ public class CoreCollector {
         var metadata = new CoreDumpMetadata();
 
         if (JAVA_HEAP_DUMP_PATTERN.matcher(coredumpPath.getFileName().toString()).find()) {
-            metadata.setBinPath("java")
+            metadata.setType(CoreDumpMetadata.Type.JVM_HEAP)
+                    .setBinPath("java")
                     .setBacktrace(List.of("Heap dump, no backtrace available"));
             return metadata;
         }
 
         try {
             String binPath = readBinPath(context, coredumpPath);
-            metadata.setBinPath(binPath);
+            metadata.setType(CoreDumpMetadata.Type.CORE_DUMP).setBinPath(binPath);
 
             if (Path.of(binPath).getFileName().toString().equals("java")) {
                 metadata.setBacktraceAllThreads(readJstack(context, coredumpPath, binPath));
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 4fa18c71da0..2ca9e084d96 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
@@ -143,6 +143,7 @@ public class CoreCollectorTest {
                 String.join("\n", GDB_BACKTRACE));
 
         var expected = new CoreDumpMetadata().setBinPath(TEST_BIN_PATH)
+                                             .setType(CoreDumpMetadata.Type.CORE_DUMP)
                                              .setBacktrace(GDB_BACKTRACE)
                                              .setBacktraceAllThreads(GDB_BACKTRACE);
         assertEquals(expected, coreCollector.collect(context, TEST_CORE_PATH));
@@ -156,7 +157,7 @@ public class CoreCollectorTest {
         mockExec(new String[]{GDB_PATH_RHEL8 + " -n -ex set print frame-arguments none -ex bt -batch /usr/bin/program /tmp/core.1234"},
                 "", "Failure");
 
-        var expected = new CoreDumpMetadata().setBinPath(TEST_BIN_PATH);
+        var expected = new CoreDumpMetadata().setBinPath(TEST_BIN_PATH).setType(CoreDumpMetadata.Type.CORE_DUMP);
         assertEquals(expected, coreCollector.collect(context, TEST_CORE_PATH));
     }
 
@@ -174,6 +175,7 @@ public class CoreCollectorTest {
                 jstack);
 
         var expected = new CoreDumpMetadata().setBinPath(jdkPath)
+                                             .setType(CoreDumpMetadata.Type.CORE_DUMP)
                                              .setBacktraceAllThreads(List.of(jstack));
         assertEquals(expected, coreCollector.collect(context, TEST_CORE_PATH));
     }
@@ -181,6 +183,7 @@ public class CoreCollectorTest {
     @Test
     void metadata_for_java_heap_dump() {
         var expected = new CoreDumpMetadata().setBinPath("java")
+                                             .setType(CoreDumpMetadata.Type.JVM_HEAP)
                                              .setBacktrace(List.of("Heap dump, no backtrace available"));
 
         assertEquals(expected, coreCollector.collect(context, context.paths().of("/dump_java_pid123.hprof")));