From 65cf760916f7fe0e3d06f5e06a53e0a96b24d947 Mon Sep 17 00:00:00 2001
From: Ryan Egesdahl <ryan.egesdahl@mongodb.com>
Date: Thu, 3 Mar 2022 15:00:52 +0000
Subject: [PATCH] SERVER-61032 Ensure all current references to GDB are for v3
 toolchain

---
 buildscripts/resmokelib/hang_analyzer/dumper.py               | 2 +-
 .../resmokelib/powercycle/remote_hang_analyzer/__init__.py    | 2 +-
 buildscripts/setup_spawnhost_coredump                         | 4 ++--
 evergreen/failed_unittests_gather.sh                          | 2 +-
 evergreen/hang_analyzer.sh                                    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildscripts/resmokelib/hang_analyzer/dumper.py b/buildscripts/resmokelib/hang_analyzer/dumper.py
index d548e118733..e5112b870b3 100644
--- a/buildscripts/resmokelib/hang_analyzer/dumper.py
+++ b/buildscripts/resmokelib/hang_analyzer/dumper.py
@@ -332,7 +332,7 @@ class GDBDumper(Dumper):
 
     def _find_debugger(self, debugger):
         """Find the installed debugger."""
-        return find_program(debugger, ['/opt/mongodbtoolchain/gdb/bin', '/usr/bin'])
+        return find_program(debugger, ['/opt/mongodbtoolchain/v3/bin', '/usr/bin'])
 
     def _prefix(self):
         """Return the commands to set up a debugger process."""
diff --git a/buildscripts/resmokelib/powercycle/remote_hang_analyzer/__init__.py b/buildscripts/resmokelib/powercycle/remote_hang_analyzer/__init__.py
index 967692695a4..e208a37a05a 100644
--- a/buildscripts/resmokelib/powercycle/remote_hang_analyzer/__init__.py
+++ b/buildscripts/resmokelib/powercycle/remote_hang_analyzer/__init__.py
@@ -48,7 +48,7 @@ class RunHangAnalyzerOnRemoteInstance(PowercycleCommand):
         # we don't want to evaluate the local python variable, but instead pass the python string
         # so the remote host will use the right python when the virtualenv is sourced.
         cmds = f"{cmds}; cd {remote_dir}"
-        cmds = f"{cmds}; PATH=\"/opt/mongodbtoolchain/gdb/bin:$PATH\" python buildscripts/resmoke.py hang-analyzer {hang_analyzer_option}"
+        cmds = f"{cmds}; PATH=\"/opt/mongodbtoolchain/v3/bin:$PATH\" python buildscripts/resmoke.py hang-analyzer {hang_analyzer_option}"
         self.remote_op.operation(SSHOperation.SHELL, cmds, None)
 
         file_param = []
diff --git a/buildscripts/setup_spawnhost_coredump b/buildscripts/setup_spawnhost_coredump
index 2ff610c00e0..7d4f13a2cb7 100755
--- a/buildscripts/setup_spawnhost_coredump
+++ b/buildscripts/setup_spawnhost_coredump
@@ -14,7 +14,7 @@ cat >> ~/.profile <<EOF
 cat ~/.setup_spawnhost_coredump_progress
 # Coredumps generated by a toolchain built mongodb can be problematic when examined with the system
 # gdb.
-export PATH=/opt/mongodbtoolchain/gdb/bin:$PATH
+export PATH=/opt/mongodbtoolchain/v3/bin:$PATH
 # As per below, put the user into the appropriate directory. This is where gdb is expected to be
 # invoked from.
 cd debug
@@ -33,7 +33,7 @@ echo "To examine a core dump, type 'gdb ./<binary> ./<core file>'"
 cat ~/.setup_spawnhost_coredump_progress
 EOF
 
-export PATH=/opt/mongodbtoolchain/gdb/bin:$PATH
+export PATH=/opt/mongodbtoolchain/v3/bin:$PATH
 echo 'if [ -f ~/.profile ]; then
     . ~/.profile
 fi' >> .bash_profile
diff --git a/evergreen/failed_unittests_gather.sh b/evergreen/failed_unittests_gather.sh
index 7e5edf7797b..9c61c14fef0 100644
--- a/evergreen/failed_unittests_gather.sh
+++ b/evergreen/failed_unittests_gather.sh
@@ -19,7 +19,7 @@ for core_file in $core_files; do
   # A core file name does not always have the executable name that generated it.
   # See http://stackoverflow.com/questions/34801353/core-dump-filename-gets-thread-name-instead-of-executable-name-with-core-pattern
   # On platforms with GDB, we get the binary name from core file
-  gdb=/opt/mongodbtoolchain/gdb/bin/gdb
+  gdb=/opt/mongodbtoolchain/v3/bin/gdb
   if [ -f $gdb ]; then
     binary_file=$($gdb -batch --quiet -ex "core $core_file" 2> /dev/null | grep "Core was generated" | cut -f2 -d "\`" | cut -f1 -d "'" | cut -f1 -d " ")
     binary_file_locations=$binary_file
diff --git a/evergreen/hang_analyzer.sh b/evergreen/hang_analyzer.sh
index 104f9b5b30a..980336c4d5d 100644
--- a/evergreen/hang_analyzer.sh
+++ b/evergreen/hang_analyzer.sh
@@ -14,8 +14,8 @@ else
 fi
 
 activate_venv
-echo "Calling the hang analyzer: PATH=\"/opt/mongodbtoolchain/gdb/bin:$PATH\" $python buildscripts/resmoke.py hang-analyzer $hang_analyzer_option"
-PATH="/opt/mongodbtoolchain/gdb/bin:$PATH" $python buildscripts/resmoke.py hang-analyzer $hang_analyzer_option
+echo "Calling the hang analyzer: PATH=\"/opt/mongodbtoolchain/v3/bin:$PATH\" $python buildscripts/resmoke.py hang-analyzer $hang_analyzer_option"
+PATH="/opt/mongodbtoolchain/v3/bin:$PATH" $python buildscripts/resmoke.py hang-analyzer $hang_analyzer_option
 
 # Call hang analyzer for tasks that are running remote mongo processes
 if [ -n "${private_ip_address}" ]; then