From 80934a5af1629068628617dbeb25a4b96d3e6753 Mon Sep 17 00:00:00 2001
From: Jake Smith <jake.smith@lexisnexisrisk.com>
Date: Wed, 26 Jun 2024 18:12:22 +0100
Subject: [PATCH] HPCC-32159 Fix core stack capture

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
---
 initfiles/bin/check_executes | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/initfiles/bin/check_executes b/initfiles/bin/check_executes
index 5214b767026..67d17c95564 100755
--- a/initfiles/bin/check_executes
+++ b/initfiles/bin/check_executes
@@ -101,11 +101,16 @@ if [ $PMD_ALWAYS = true ] || [ $retVal -ne 0 ]; then
   done
   cp `ls -rt /tmp/postmortem.$progPid.log.*` $POST_MORTEM_DIR
   rm /tmp/postmortem.$progPid.log.*
-  if [ -f core ]; then
-    echo "Generating info from core file to $POST_MORTEM_DIR/info.log" | tee -a $POST_MORTEM_DIR/info.log
-    gdb -batch -ix /opt/HPCCSystems/bin/.gdbinit -x /opt/HPCCSystems/bin/post-mortem-gdb ${PMD_PROGNAME} core 2>$POST_MORTEM_DIR/info.err >>$POST_MORTEM_DIR/info.log
-    echo "Generated info from core file" | tee -a $POST_MORTEM_DIR/info.log
-    rm core
+
+  readarray -t core_files < <(find . -maxdepth 1 -type f -name 'core*' -print)
+  # we only expect one, but cater for multiple
+  if [[ ${#core_files[@]} -gt 0 ]]; then
+    for file in "${core_files[@]}"; do
+      echo "Generating info from core file($file) to $POST_MORTEM_DIR/info.log" | tee -a $POST_MORTEM_DIR/info.log
+      gdb -batch -ix /opt/HPCCSystems/bin/.gdbinit -x /opt/HPCCSystems/bin/post-mortem-gdb ${PMD_PROGNAME} $file 2>$POST_MORTEM_DIR/info.err >>$POST_MORTEM_DIR/info.log
+      echo "Generated info from core file($file)" | tee -a $POST_MORTEM_DIR/info.log
+      rm $file
+    done
   fi
   dmesg -xT > $POST_MORTEM_DIR/dmesg.log
   if [[ -n "${PMD_DALISERVER}" ]] && [[ -n "${PMD_WORKUNIT}" ]]; then