fix more nitpicks

Author: sbryngelson

.github/scripts/monitor_slurm_job.sh

@@ -119,15 +119,28 @@ exit_code=""
 # Try scontrol first (works for recent jobs)
 scontrol_output=$(scontrol show job "$job_id" 2>/dev/null || echo "")
 if [ -n "$scontrol_output" ]; then
-  exit_code=$(echo "$scontrol_output" | grep -oE 'ExitCode=[0-9]+:[0-9]+' | cut -d= -f2 || echo "")
+  # Prefer the JobId line matching the parent job, then extract ExitCode
+  parent_block=$(echo "$scontrol_output" | awk -v id="$job_id" '
+    BEGIN{RS="\n\n"; ORS="\n\n"} 
+    $0 ~ "JobId="id"[^0-9]" || $0 ~ "JobId="id"$" {print; exit}
+  ')
+  if [ -n "$parent_block" ]; then
+    exit_code=$(echo "$parent_block" | grep -oE 'ExitCode=[0-9]+:[0-9]+' | head -n1 | cut -d= -f2 || echo "")
+  else
+    # Fallback: take first ExitCode found
+    exit_code=$(echo "$scontrol_output" | grep -oE 'ExitCode=[0-9]+:[0-9]+' | head -n1 | cut -d= -f2 || echo "")
+  fi
 fi
 
 # If scontrol failed or returned invalid job, try sacct (for completed/aged-out jobs)
 if [ -z "$exit_code" ]; then
   echo "Warning: scontrol failed to get exit code, trying sacct..."
-  sacct_output=$(sacct -j "$job_id" --format=ExitCode --noheader --parsable2 2>/dev/null | head -n1 || echo "")
-  if [ -n "$sacct_output" ]; then
-    exit_code="$sacct_output"
+  # Only consider terminal states to avoid partial step lines
+  sacct_line=$(sacct -j "$job_id" --format=JobID,State,ExitCode --noheader --parsable2 2>/dev/null | awk -F'|' '
+    $2 ~ /COMPLETED|FAILED|CANCELLED|TIMEOUT|OUT_OF_MEMORY/ {print; exit}
+  ')
+  if [ -n "$sacct_line" ]; then
+    exit_code=$(echo "$sacct_line" | awk -F'|' '{print $3}' | head -n1)
   fi
 fi
 

.github/workflows/bench.yml

@@ -115,18 +115,28 @@ jobs:
             
             # Submit job
             submit_output=$(bash .github/workflows/$cluster/submit-bench.sh \
-              .github/workflows/$cluster/bench.sh $device $interface 2>&1)
+              .github/workflows/$cluster/bench.sh "$device" "$interface" 2>&1)
             
+            # Extract job ID using standard sbatch output pattern
             job_id=$(echo "$submit_output" | sed -n 's/.*Submitted batch job \([0-9][0-9]*\).*/\1/p')
-            job_slug="bench-$device-$interface"
-            output_file="${job_slug}.out"
             
-            if [ -z "$job_id" ]; then
-              echo "ERROR: Failed to submit job"
-              echo "$submit_output"
-              return 1
+            # Validate that we got a numeric job ID
+            if ! [[ "$job_id" =~ ^[0-9]+$ ]]; then
+              # Fallback: try extracting last number from output (handles non-standard sbatch messages)
+              job_id=$(echo "$submit_output" | grep -Eo '[0-9]+' | tail -n1)
+              
+              # Final validation
+              if ! [[ "$job_id" =~ ^[0-9]+$ ]]; then
+                echo "ERROR: Failed to extract valid job ID from submit output:"
+                echo "$submit_output"
+                return 1
+              fi
+              echo "Warning: Used fallback method to extract job ID: $job_id"
             fi
             
+            job_slug="bench-$device-$interface"
+            output_file="${job_slug}.out"
+            
             # Use the monitoring script from PR checkout
             bash "$MONITOR_SCRIPT" "$job_id" "$output_file"
           }

toolchain/mfc/test/test.py

@@ -410,14 +410,15 @@ def _handle_case(case: TestCase, devices: typing.Set[int]):
 
     except subprocess.TimeoutExpired as exc:
         # Subprocess timeout - the process was actually killed
+        timeout_hours = TEST_TIMEOUT_SECONDS / 3600
         if os.path.exists(current_log_path):
             log_msg = f"Check the log at: {current_log_path}"
         else:
             log_msg = (
                 f"Log file ({current_log_path}) may not exist if the timeout occurred early."
             )
         raise MFCException(
-            f"Test {case} exceeded 1 hour timeout (process was killed). "
+            f"Test {case} exceeded {timeout_hours:.1f} hour timeout (process was killed). "
             f"This may indicate a hung simulation or misconfigured case. "
             f"{log_msg}"
         ) from exc