johba/disinto
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: ci_fix_count/ci_fix_increment not atomic — potential race under concurrent polls (#118)' (#124) from fix/issue-118 into main

Browse source
This commit is contained in:
johba 2026-03-18 07:37:54 +01:00
commit 9b833532f5
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/dev-poll.sh
View file

@ -22,13 +22,14 @@ source "$(dirname "$0")/../lib/ci-helpers.sh"
# Track CI fix attempts per PR to avoid infinite respawn loops # Track CI fix attempts per PR to avoid infinite respawn loops
CI_FIX_TRACKER="${FACTORY_ROOT}/dev/ci-fixes-${PROJECT_NAME:-harb}.json" CI_FIX_TRACKER="${FACTORY_ROOT}/dev/ci-fixes-${PROJECT_NAME:-harb}.json"
CI_FIX_LOCK="${CI_FIX_TRACKER}.lock"
ci_fix_count() { ci_fix_count() {
local pr="$1" local pr="$1"
python3 -c "import json,sys;d=json.load(open('$CI_FIX_TRACKER')) if __import__('os').path.exists('$CI_FIX_TRACKER') else {};print(d.get(str($pr),0))" 2>/dev/null || echo 0 flock "$CI_FIX_LOCK" python3 -c "import json,sys;d=json.load(open('$CI_FIX_TRACKER')) if __import__('os').path.exists('$CI_FIX_TRACKER') else {};print(d.get(str($pr),0))" 2>/dev/null || echo 0
} }
ci_fix_increment() { ci_fix_increment() {
local pr="$1" local pr="$1"
python3 -c " flock "$CI_FIX_LOCK" python3 -c "
import json,os import json,os
f='$CI_FIX_TRACKER' f='$CI_FIX_TRACKER'
d=json.load(open(f)) if os.path.exists(f) else {} d=json.load(open(f)) if os.path.exists(f) else {}
@ -38,7 +39,7 @@ json.dump(d,open(f,'w'))
} }
ci_fix_reset() { ci_fix_reset() {
local pr="$1" local pr="$1"
python3 -c " flock "$CI_FIX_LOCK" python3 -c "
import json,os import json,os
f='$CI_FIX_TRACKER' f='$CI_FIX_TRACKER'
d=json.load(open(f)) if os.path.exists(f) else {} d=json.load(open(f)) if os.path.exists(f) else {}