diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-05-28 16:15:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 16:15:04 +0200 |
| commit | 5f051d508244d49e61dfb3097308ff036696ec0a (patch) | |
| tree | d48005ab20f9616be299760c1af5d7438f0d809f /node-admin | |
| parent | 24db5f1c9e0e407dc0aa45febfc7b8992c097a66 (diff) | |
| parent | 2860f483210ac610346d36252c57121f0317cec2 (diff) | |
Merge pull request #18021 from vespa-engine/freva/report-core-cluster
Report application cluster for coredumps
Diffstat (limited to 'node-admin')
3 files changed, 9 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 10e0dd50761..9ced178cff9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -188,6 +188,10 @@ public class StorageMaintainer { attributes.put("application", owner.application().value()); attributes.put("instance", owner.instance().value()); }); + context.node().membership().ifPresent(membership -> { + attributes.put("cluster_id", membership.clusterId()); + attributes.put("cluster_type", membership.type().value()); + }); return Collections.unmodifiableMap(attributes); } 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 09c0a4ae491..7f79efdeab9 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 @@ -174,7 +174,10 @@ public class CoredumpHandler { Path coredumpFilePathInContainer = context.pathInNodeFromPathOnHost(coredumpFilePathOnHost); Map<String, Object> metadata = new HashMap<>(coreCollector.collect(context, coredumpFilePathInContainer)); metadata.putAll(nodeAttributesSupplier.get()); - metadata.put("coredump_path", doneCoredumpsPath.resolve(context.containerName().asString()).resolve(coredumpDirectory.getFileName()).toString()); + metadata.put("coredump_path", doneCoredumpsPath + .resolve(context.containerName().asString()) + .resolve(coredumpDirectory.getFileName()) + .resolve(coredumpFilePathOnHost.getFileName()).toString()); String metadataFields = objectMapper.writeValueAsString(Map.of("fields", metadata)); metadataPath.writeUtf8File(metadataFields); 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 4f2f2f985b6..6dd7241fd63 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 @@ -159,7 +159,7 @@ public class CoredumpHandlerTest { "\"backtrace\":[\"call 1\",\"function 2\",\"something something\"]," + "\"vespa_version\":\"6.48.4\"," + "\"bin_path\":\"/bin/bash\"," + - "\"coredump_path\":\"/home/docker/dumps/container-123/id-123\"," + + "\"coredump_path\":\"/home/docker/dumps/container-123/id-123/dump_core.456\"," + "\"docker_image\":\"vespa/ci:6.48.4\"" + "}}"; |