diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-18 17:13:30 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-18 17:13:30 +0200 |
commit | fa927f7c88e0b19276f4d8e029a5826b0fa83b31 (patch) | |
tree | eb63748351647657294ec0f50c8a9abc3cdaa1a2 /node-admin | |
parent | 989e80984bd505ba6d2479d050d9aa74481568d8 (diff) |
Remove special handling in CoreCollector for java 8
Diffstat (limited to 'node-admin')
2 files changed, 1 insertions, 29 deletions
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 6e5f65a5d48..c063059e8a9 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 @@ -86,9 +86,7 @@ public class CoreCollector { } List<String> readJstack(NodeAgentContext context, Path coredumpPath, Path binPath) { - String[] command = isRunningVespa6(context) ? - new String[] {"jstack", binPath.toString(), coredumpPath.toString()} : - new String[] {"jhsdb", "jstack", "--exe", binPath.toString(), "--core", coredumpPath.toString()}; + String[] command = {"jhsdb", "jstack", "--exe", binPath.toString(), "--core", coredumpPath.toString()}; ProcessResult result = docker.executeCommandInContainerAsRoot(context, command); if (result.getExitStatus() != 0) @@ -120,8 +118,4 @@ public class CoreCollector { } return data; } - - private static boolean isRunningVespa6(NodeAgentContext context) { - return context.node().wantedVespaVersion().map(v -> v.getMajor() == 6).orElse(false); - } } 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 37156ade064..bcec01fe91d 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 @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.maintenance.coredump; -import com.yahoo.component.Version; import com.yahoo.vespa.hosted.dockerapi.ProcessResult; import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext; @@ -162,27 +161,6 @@ public class CoreCollectorTest { assertEquals(expectedData, coreCollector.collect(context, TEST_CORE_PATH)); } - @Test - public void reportsJstackInsteadOfGdbForJdkCoresVespa6() { - NodeAgentContext contextVespa6 = new NodeAgentContextImpl.Builder("container-123.domain.tld") - .nodeSpecBuilder(n -> n.wantedVespaVersion(Version.fromString("6.330.51"))) - .build(); - - mockExec(contextVespa6, new String[]{"file", TEST_CORE_PATH.toString()}, - "dump.core.5954: ELF 64-bit LSB core file x86-64, version 1 (SYSV), too many program header sections (33172)", ""); - mockExec(contextVespa6, new String[]{"/bin/sh", "-c", GDB_PATH + " -n -batch -core /tmp/core.1234 | grep '^Core was generated by'"}, - "Core was generated by `" + JDK_PATH + " -Dconfig.id=default/container.11 -XX:+Pre'.", ""); - - String jstack = "jstack8"; - mockExec(contextVespa6, new String[]{"jstack", JDK_PATH, "/tmp/core.1234"}, - jstack, ""); - - Map<String, Object> expectedData = Map.of( - "bin_path", JDK_PATH, - "backtrace_all_threads", List.of(jstack)); - assertEquals(expectedData, coreCollector.collect(contextVespa6, TEST_CORE_PATH)); - } - private void mockExec(String[] cmd, String output) { mockExec(cmd, output, ""); } |