Also include core being currently processed

2 files changed, 8 insertions, 2 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
index c6c024ca658..293f2c688d6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
@@ -211,7 +211,8 @@ public class CoredumpHandler {
         int numberOfUnprocessedCoredumps = FileFinder.files(containerCrashPathOnHost)
                 .match(nameStartsWith(".").negate())
                 .match(nameMatches(HS_ERR_PATTERN).negate())
-                .maxDepth(1)
+                .match(nameEndsWith(".lz4").negate())
+                .match(nameStartsWith("metadata").negate())
                 .list().size();
 
         metrics.declareGauge(Metrics.APPLICATION_NODE, "coredumps.enqueued", dimensions, Metrics.DimensionType.PRETAGGED).sample(numberOfUnprocessedCoredumps);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
index 30a08483cf2..b420b6aac23 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
@@ -215,9 +215,14 @@ public class CoredumpHandlerTest {
 
     @Test
     public void report_enqueued_and_processed_metrics() throws IOException {
+        Path processingPath = crashPathInContainer.resolve("processing");
         Files.createFile(crashPathInContainer.resolve("dump-1"));
         Files.createFile(crashPathInContainer.resolve("dump-2"));
         Files.createFile(crashPathInContainer.resolve("hs_err_pid2.log"));
+        Files.createDirectory(processingPath);
+        Files.createFile(processingPath.resolve("metadata.json"));
+        Files.createFile(processingPath.resolve("dump-3"));
+
         new UnixPath(doneCoredumpsPath.resolve("container-123").resolve("dump-3-folder").resolve("dump-3"))
                 .createParents()
                 .createNewFile();
@@ -226,7 +231,7 @@ public class CoredumpHandlerTest {
         List<DimensionMetrics> updatedMetrics = metrics.getMetricsByType(Metrics.DimensionType.PRETAGGED);
         assertEquals(1, updatedMetrics.size());
         Map<String, Number> values = updatedMetrics.get(0).getMetrics();
-        assertEquals(2, values.get("coredumps.enqueued").intValue());
+        assertEquals(3, values.get("coredumps.enqueued").intValue());
         assertEquals(1, values.get("coredumps.processed").intValue());
     }