diff --git a/internal/scaffold/fullsend-repo/scripts/lib/github-api-csma.sh b/internal/scaffold/fullsend-repo/scripts/lib/github-api-csma.sh index a281397e28..760fb93173 100644 --- a/internal/scaffold/fullsend-repo/scripts/lib/github-api-csma.sh +++ b/internal/scaffold/fullsend-repo/scripts/lib/github-api-csma.sh @@ -14,6 +14,7 @@ # GITHUB_CSMA_MIN_REMAINING_GRAPHQL — default 100 # GITHUB_CSMA_SLOT_MIN_MS — default 250 # GITHUB_CSMA_SLOT_MAX_MS — default 750 (0 disables jitter) +# GITHUB_CSMA_SPREAD_MAX_SEC — default 60 (post-reset desync spread) # GITHUB_CSMA_BACKOFF_CAP_SEC — default 120 # shellcheck shell=bash @@ -41,6 +42,10 @@ _github_csma_slot_max_ms() { echo "${GITHUB_CSMA_SLOT_MAX_MS:-750}" } +_github_csma_spread_max_sec() { + echo "${GITHUB_CSMA_SPREAD_MAX_SEC:-60}" +} + _github_csma_backoff_cap_sec() { echo "${GITHUB_CSMA_BACKOFF_CAP_SEC:-120}" } @@ -85,6 +90,16 @@ github_csma_sense() { echo "Rate limit sense: ${resource} remaining=${remaining} (min=${min_remaining}); waiting ${wait_secs}s until reset..." >&2 sleep "${wait_secs}" + + # After a rate-limit sleep, all runners wake at the same reset timestamp. + # Spread them over a wide window to avoid a thundering herd. + local spread_max + spread_max=$(_github_csma_spread_max_sec) + if (( spread_max > 0 )); then + local spread_secs=$(( RANDOM % spread_max )) + echo "Rate limit reset — spreading ${spread_secs}s to desync from other runners..." >&2 + sleep "${spread_secs}" + fi } # Random inter-call delay (slot time) to reduce synchronized collisions.