diff options
Diffstat (limited to 'node-admin')
2 files changed, 8 insertions, 3 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 9924202e2ae..5dd7bcd77fd 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,13 +211,16 @@ public class CoredumpHandler { // Unprocessed coredumps int numberOfUnprocessedCoredumps = FileFinder.files(containerCrashPathOnHost) .match(nameStartsWith(".").negate()) + .match(nameMatches(HS_ERR_PATTERN).negate()) + .maxDepth(1) .list().size(); metrics.declareGauge(Metrics.APPLICATION_NODE, "coredumps.enqueued", dimensions, Metrics.DimensionType.PRETAGGED).sample(numberOfUnprocessedCoredumps); // Processed coredumps Path processedCoredumpsPath = doneCoredumpsPath.resolve(context.containerName().asString()); - int numberOfProcessedCoredumps = FileFinder.files(processedCoredumpsPath) + int numberOfProcessedCoredumps = FileFinder.directories(processedCoredumpsPath) + .maxDepth(1) .list().size(); metrics.declareGauge(Metrics.APPLICATION_NODE, "coredumps.processed", dimensions, Metrics.DimensionType.PRETAGGED).sample(numberOfProcessedCoredumps); 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 62bf9e3f9c2..60a4462e9e9 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 @@ -217,7 +217,10 @@ public class CoredumpHandlerTest { public void report_enqueued_and_processed_metrics() throws IOException { Files.createFile(crashPathInContainer.resolve("dump-1")); Files.createFile(crashPathInContainer.resolve("dump-2")); - Files.createFile(doneCoredumpsPath.resolve("container-123").resolve("dump-3")); + Files.createFile(crashPathInContainer.resolve("hs_err_pid2.log")); + new UnixPath(doneCoredumpsPath.resolve("container-123").resolve("dump-3-folder").resolve("dump-3")) + .createParents() + .createNewFile(); coredumpHandler.updateMetrics(context, crashPathInContainer); List<DimensionMetrics> updatedMetrics = metrics.getMetricsByType(Metrics.DimensionType.PRETAGGED); @@ -229,7 +232,6 @@ public class CoredumpHandlerTest { @Before public void setup() throws IOException { - Files.createDirectories(donePath.resolve("container-123")); Files.createDirectories(crashPathInContainer); } |