Skip to content

fix: post-merge correctness + hang fixes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BlueBirdBack merged 1 commit into from
Oct 11, 2026
Merged

fix: post-merge correctness + hang fixes #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions abs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,14 +690,21 @@ memspeed() { awk -F'[()]' '/MiB transferred/ {print $2; exit}' "$1"; }

abs_timeout() {
# Portable timeout (no GNU coreutils dependency, e.g. stock macOS).
# Escalates to SIGKILL after a grace period so a stuck child (e.g. uninterruptible
# I/O or a process ignoring TERM) cannot hang the whole script forever.
local secs="$1"; shift
if [ "$secs" = "0" ]; then
"$@"
return $?
fi
"$@" &
local pid=$!
( sleep "$secs"; kill -TERM "$pid" 2>/dev/null ) &
(
sleep "$secs"
kill -TERM "$pid" 2>/dev/null || exit 0
sleep 3
kill -KILL "$pid" 2>/dev/null
) &
local watcher=$!
local rc=0
wait "$pid" 2>/dev/null || rc=$?
Expand Down Expand Up @@ -1337,8 +1344,12 @@ pick_port() {
}

run_iperf_cmd() {
# Portable watchdog (GNU timeout is absent on stock macOS).
abs_timeout 18 "$@"
# Portable watchdog (GNU timeout is absent on stock macOS). Budget follows
# IPERF_TIME plus connect/handshake slack; a hardcoded 18s would kill any
# user-requested run longer than ~13s mid-test and report it as FAILED.
local budget=$(( IPERF_TIME + 15 ))
[ "$budget" -gt "$ABS_CMD_TIMEOUT" ] && budget="$ABS_CMD_TIMEOUT"
abs_timeout "$budget" "$@"
}

parse_iperf_bps() {
Expand Down Expand Up @@ -1432,6 +1443,14 @@ dd_fallback() {
add "Disk fallback dd" "dd not installed; skipped"
return 0
fi
# The fallback writes 256 MiB unconditionally; refuse to run when the target
# filesystem cannot hold it plus headroom, or we would fill the disk.
local avail_kb
avail_kb="$(df -Pk "$DIR" 2>/dev/null | awk 'NR==2 {print $4+0}')"
if [ "${avail_kb:-0}" -lt 393216 ]; then
add "Disk fallback dd" "not enough free space for 256 MiB dd test file; skipped"
return 0
fi
local dd_file="$RUN_DIR/abs-dd.test"
local write_log="$LOGDIR/dd-write.log"
local read_log="$LOGDIR/dd-read.log"
Expand Down Expand Up @@ -1846,7 +1865,7 @@ if [ -n "$FIO_BIN" ] && have python3; then

if fio_run fio-rand-write-q1 randwrite 4k 1 1 --randrepeat=0; then
qd1_write_iops="$(fio_metric write_iops)"
add "Disk random write 4K QD1" "$qd1_write_iops IOPS, $(fio_metric write_mib) MiB/s, p95 $(fio_metric read_p95_ms) ms" "$qd1_write_iops"
add "Disk random write 4K QD1" "$qd1_write_iops IOPS, $(fio_metric write_mib) MiB/s, p95 $(fio_metric write_p95_ms) ms" "$qd1_write_iops"
else
add "Disk random write 4K QD1" "FAILED; see $LOGDIR/fio-rand-write-q1.err"
fi
Expand Down
Loading