From 3ca737487d124e5aca717ca86169537b429f2353 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Mon, 15 Nov 2021 14:58:41 +0100 Subject: Remove old devtools paths --- .../node/admin/maintenance/coredump/CoreCollector.java | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'node-admin/src/main/java/com/yahoo') 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 c5c8d0e121d..60330984f57 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 @@ -29,8 +29,6 @@ public class CoreCollector { private static final Pattern CORE_GENERATOR_PATH_PATTERN = Pattern.compile("^Core was generated by `(?.*?)'.$"); private static final Pattern EXECFN_PATH_PATTERN = Pattern.compile("^.* execfn: '(?.*?)'"); private static final Pattern FROM_PATH_PATTERN = Pattern.compile("^.* from '(?.*?)'"); - static final String GDB_PATH_RHEL7_DT9 = "/opt/rh/devtoolset-9/root/bin/gdb"; - static final String GDB_PATH_RHEL7_DT10 = "/opt/rh/devtoolset-10/root/bin/gdb"; static final String GDB_PATH_RHEL8 = "/opt/rh/gcc-toolset-10/root/bin/gdb"; static final Map JAVA_HEAP_DUMP_METADATA = @@ -43,17 +41,6 @@ public class CoreCollector { } String getGdbPath(NodeAgentContext context) { - // TODO: Remove when we do not have any devtoolset-9 installs left - String[] command_rhel7_dt9 = {"stat", GDB_PATH_RHEL7_DT9}; - if (docker.executeCommandInContainerAsRoot(context, command_rhel7_dt9).getExitCode() == 0) { - return GDB_PATH_RHEL7_DT9; - } - - String[] command_rhel7_dt10 = {"stat", GDB_PATH_RHEL7_DT10}; - if (docker.executeCommandInContainerAsRoot(context, command_rhel7_dt10).getExitCode() == 0) { - return GDB_PATH_RHEL7_DT10; - } - return GDB_PATH_RHEL8; } -- cgit v1.2.3