chore: add private-safe controller startup diagnostics
Add fixed startup branch labels and numeric apply exit status without relaxing startup guards or exposing private values. Cover shared launch/ACK and wrapper branches plus failed apply cleanup. Diagnostics only; the ACK publication race remains unchanged. Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
1 parent
de453ed2c8
commit
ade3b89137
6 files changed
+131
-7
No files matched your search
@@ -78,7 +78,7 @@ if name == 'sleep':
|
||||
sys.exit(0)
|
||||
if scenario.startswith('generic-budget-') and seconds != 60:
|
||||
os.execv(os.environ['REAL_SLEEP'], [os.environ['REAL_SLEEP'], *sys.argv[1:]])
|
||||
if seconds == 60 and scenario in ('generic-ss', 'generic-unsafe', 'generic-budget-monitor', 'generic-budget-reconcile', 'generic-budget-ack', 'generic-apply-blocked'):
|
||||
if seconds == 60 and scenario in ('generic-ss', 'generic-unsafe', 'generic-budget-monitor', 'generic-budget-reconcile', 'generic-budget-ack', 'generic-apply-blocked', 'generic-apply-abrupt', 'generic-apply-cleanup'):
|
||||
log('generic-pause')
|
||||
(root / 'budget-pause').touch()
|
||||
if scenario != 'generic-ss':
|
||||
@@ -335,6 +335,8 @@ elif command == 'resource-apply':
|
||||
log('resource-apply')
|
||||
if scenario == 'generic-apply-blocked':
|
||||
sys.exit(78)
|
||||
if scenario in ('generic-apply-abrupt', 'generic-apply-cleanup'):
|
||||
sys.exit(23)
|
||||
if scenario == 'generic-apply-cancel':
|
||||
def restored(*_):
|
||||
log('resource-restored')
|
||||
@@ -384,6 +386,8 @@ def run(scenario, expected, dns='', mode='native'):
|
||||
text = text.replace('config_dir=/run/zapret-autotune-ss', f'config_dir={configs}')
|
||||
text = text.replace('/usr/local/bin/zapret-autotune', str(binary / 'autotune'))
|
||||
text = text.replace('/opt/zapret2/init.d/sysv/zapret2', str(binary / 'zapret2'))
|
||||
if scenario == 'generic-apply-cleanup':
|
||||
text = text.replace('cleanup_session || { echo', "cleanup_session() { return 78; }\n cleanup_session || { echo", 1)
|
||||
if scenario.endswith('-race'):
|
||||
barrier = f'{binary / "autotune"} qualification-race-barrier "$monitor_pid"\n'
|
||||
loop = 'while dns_alive && kill -0 "$server_pid" && kill -0 "$local_pid" && kill -0 "$monitor_pid"; do'
|
||||
@@ -439,6 +443,10 @@ def run(scenario, expected, dns='', mode='native'):
|
||||
assert result.returncode == expected, (scenario, result.returncode, result.stderr, events)
|
||||
assert b'Illegal number' not in result.stderr, (scenario, result.stderr)
|
||||
assert b'ab' * 32 not in result.stdout + result.stderr
|
||||
if scenario in ('generic-apply-blocked', 'generic-apply-abrupt', 'generic-apply-cleanup'):
|
||||
code = 78 if scenario == 'generic-apply-blocked' else 23
|
||||
assert f'controller-startup: apply_wait_exit={code}\n'.encode() in result.stderr, result.stderr
|
||||
assert (b'controller-startup: apply_cleanup=failed\n' in result.stderr) == (scenario == 'generic-apply-cleanup'), result.stderr
|
||||
for pid in ((root / 'children').read_text().splitlines() if (root / 'children').exists() else []):
|
||||
assert not Path(f'/proc/{pid}').exists(), (scenario, 'child not joined', pid)
|
||||
if scenario == 'orphans':
|
||||
@@ -506,6 +514,9 @@ assert 'resource-restored' in events and 'start' not in events and 'monitor 1' n
|
||||
assert events.index('resource-restored') < events.index('stop') < events.index('dns-stop'), events
|
||||
events = run('generic-apply-blocked', 0, mode='doh')
|
||||
assert 'start' not in events and 'monitor 1' not in events and 'generic-pause' in events, events
|
||||
for scenario, code in (('generic-apply-abrupt', 0), ('generic-apply-cleanup', 78)):
|
||||
events = run(scenario, code, mode='doh')
|
||||
assert 'start' not in events and 'monitor 1' not in events and 'resource-applied' not in events, events
|
||||
for scenario in ('generic-budget-monitor', 'generic-budget-reconcile', 'generic-budget-ack'):
|
||||
events = run(scenario, 78, mode='doh')
|
||||
assert events.count('start') == 1 and 'stop' not in events, (scenario, events)
|
||||
|
||||
Reference in new issue
Block a user