Merge pull request #26733 from vespa-engine/freva/propagate-created

Report core created timestamp as last modified time

2 files changed, 24 insertions, 3 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoresTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoresTest.java
index f49dd2e705b..b35f4d6c790 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoresTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/cores/CoresTest.java
@@ -16,6 +16,7 @@ import org.mockito.ArgumentCaptor;
 
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 
@@ -40,6 +41,8 @@ class CoresTest {
     private final HostName hostname = HostName.of("foo.com");
     private final String id = "5c987afb-347a-49ee-a0c5-bef56bbddeb0";
     private final CoreDumpMetadata metadata = new CoreDumpMetadata()
+            .setType(CoreDumpMetadata.Type.OOM)
+            .setCreated(Instant.ofEpochMilli(12345678))
             .setKernelVersion("4.18.0-372.26.1.el8_6.x86_64")
             .setCpuMicrocodeVersion("0x1000065")
             .setCoreDumpPath(fileSystem.getPath("/data/vespa/processed-coredumps/h7641a/5c987afb-347a-49ee-a0c5-bef56bbddeb0/dump_java.core.813"))
@@ -83,9 +86,11 @@ class CoresTest {
                        "bin_path": "/usr/bin/java",
                        "coredump_path": "/data/vespa/processed-coredumps/h7641a/5c987afb-347a-49ee-a0c5-bef56bbddeb0/dump_java.core.813",
                        "cpu_microcode_version": "0x1000065",
+                       "created": 12345678,
                        "decryption_token": "987def",
                        "docker_image": "us-central1-docker.pkg.dev/vespa-external-cd/vespa-cloud/vespa/cloud-tenant-rhel8:8.68.8",
                        "kernel_version": "4.18.0-372.26.1.el8_6.x86_64",
+                       "type": "OOM",
                        "vespa_version": "8.68.8"
                      }""",
                      JsonTestHelper.normalize(uncheck(() -> mapper.writeValueAsString(bodyJsonPojoCaptor.getValue()))));
@@ -128,9 +133,11 @@ class CoresTest {
                        "bin_path": "/usr/bin/java",
                        "coredump_path": "/data/vespa/processed-coredumps/h7641a/5c987afb-347a-49ee-a0c5-bef56bbddeb0/dump_java.core.813",
                        "cpu_microcode_version": "0x1000065",
+                       "created": 12345678,
                        "decryption_token": "987def",
                        "docker_image": "us-central1-docker.pkg.dev/vespa-external-cd/vespa-cloud/vespa/cloud-tenant-rhel8:8.68.8",
                        "kernel_version": "4.18.0-372.26.1.el8_6.x86_64",
+                       "type": "OOM",
                        "vespa_version": "8.68.8"
                      }""",
                      JsonTestHelper.normalize(new UnixPath(path).readUtf8File()));
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 2ca9e084d96..b4a35d6012c 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
@@ -5,11 +5,13 @@ import com.yahoo.vespa.hosted.node.admin.configserver.cores.CoreDumpMetadata;
 import com.yahoo.vespa.hosted.node.admin.container.ContainerOperations;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl;
+import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixPath;
 import com.yahoo.vespa.hosted.node.admin.task.util.fs.ContainerPath;
 import com.yahoo.vespa.hosted.node.admin.task.util.process.CommandResult;
 import com.yahoo.vespa.test.file.TestFileSystem;
 import org.junit.jupiter.api.Test;
 
+import java.time.Instant;
 import java.util.List;
 
 import static com.yahoo.vespa.hosted.node.admin.maintenance.coredump.CoreCollector.GDB_PATH_RHEL8;
@@ -22,12 +24,18 @@ import static org.mockito.Mockito.when;
  * @author freva
  */
 public class CoreCollectorTest {
+    private static final Instant CORE_CREATED = Instant.ofEpochMilli(2233445566L);
+    
     private final ContainerOperations docker = mock(ContainerOperations.class);
     private final CoreCollector coreCollector = new CoreCollector(docker);
     private final NodeAgentContext context = NodeAgentContextImpl.builder("container-123.domain.tld")
             .fileSystem(TestFileSystem.create()).build();
 
-    private final ContainerPath TEST_CORE_PATH = context.paths().of("/tmp/core.1234");
+    private final ContainerPath TEST_CORE_PATH = (ContainerPath) new UnixPath(context.paths().of("/tmp/core.1234"))
+            .createParents()
+            .createNewFile()
+            .setLastModifiedTime(CORE_CREATED)
+            .toPath();
     private final String TEST_BIN_PATH = "/usr/bin/program";
     private final List<String> GDB_BACKTRACE = List.of("[New Thread 2703]",
             "Core was generated by `/usr/bin/program\'.", "Program terminated with signal 11, Segmentation fault.",
@@ -143,6 +151,7 @@ public class CoreCollectorTest {
                 String.join("\n", GDB_BACKTRACE));
 
         var expected = new CoreDumpMetadata().setBinPath(TEST_BIN_PATH)
+                                             .setCreated(CORE_CREATED)
                                              .setType(CoreDumpMetadata.Type.CORE_DUMP)
                                              .setBacktrace(GDB_BACKTRACE)
                                              .setBacktraceAllThreads(GDB_BACKTRACE);
@@ -157,7 +166,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).setType(CoreDumpMetadata.Type.CORE_DUMP);
+        var expected = new CoreDumpMetadata().setBinPath(TEST_BIN_PATH).setCreated(CORE_CREATED).setType(CoreDumpMetadata.Type.CORE_DUMP);
         assertEquals(expected, coreCollector.collect(context, TEST_CORE_PATH));
     }
 
@@ -175,6 +184,7 @@ public class CoreCollectorTest {
                 jstack);
 
         var expected = new CoreDumpMetadata().setBinPath(jdkPath)
+                                             .setCreated(CORE_CREATED)
                                              .setType(CoreDumpMetadata.Type.CORE_DUMP)
                                              .setBacktraceAllThreads(List.of(jstack));
         assertEquals(expected, coreCollector.collect(context, TEST_CORE_PATH));
@@ -184,9 +194,13 @@ public class CoreCollectorTest {
     void metadata_for_java_heap_dump() {
         var expected = new CoreDumpMetadata().setBinPath("java")
                                              .setType(CoreDumpMetadata.Type.JVM_HEAP)
+                                             .setCreated(CORE_CREATED)
                                              .setBacktrace(List.of("Heap dump, no backtrace available"));
 
-        assertEquals(expected, coreCollector.collect(context, context.paths().of("/dump_java_pid123.hprof")));
+        assertEquals(expected, coreCollector.collect(context, (ContainerPath) new UnixPath(context.paths().of("/dump_java_pid123.hprof"))
+                .createNewFile()
+                .setLastModifiedTime(CORE_CREATED)
+                .toPath()));
     }
 
     private void mockExec(String[] cmd, String output) {