feat: add guarded generic startup apply
Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
1 parent
3743cdbd3e
commit
de453ed2c8
11 files changed
+1255
-49
No files matched your search
@@ -27,7 +27,15 @@ with tempfile.TemporaryDirectory(prefix='target-config-') as tmp:
|
||||
ZAPRET_AUTOTUNE_YOUTUBE_SERVICE='0', ZAPRET_AUTOTUNE_GOOGLEVIDEO_MODE='cold',
|
||||
ZAPRET_AUTOTUNE_VIDEO_ID='dQw4w9WgXcQ',
|
||||
ZAPRET_AUTOTUNE_GOOGLEVIDEO_VIDEO_IDS='["dQw4w9WgXcQ"]',
|
||||
ZAPRET_AUTOTUNE_TARGET_ROLE='managed-test',
|
||||
ZAPRET_AUTOTUNE_TARGET_ID='zapret-autotune-managed-v1',
|
||||
ZAPRET_AUTOTUNE_TARGET_DIR='/var/lib/zapret-autotune/target',
|
||||
ZAPRET_CONFIG='/var/lib/zapret-autotune/target/config',
|
||||
SOCKS_PORT='1080',
|
||||
ZAPRET_AUTOTUNE_SOCKS_PROXY='socks5h://127.0.0.1:1080')
|
||||
for name in ('ZAPRET_AUTOTUNE_RESOURCE_APPLY', 'ZAPRET_AUTOTUNE_RESOURCE_CONFIG',
|
||||
'ZAPRET_AUTOTUNE_QUALIFY_CONFIG', 'ZAPRET_AUTOTUNE_STRATEGY_CONFIG'):
|
||||
base.pop(name, None)
|
||||
for dns, valid in (('', True), ('8.8.8.8', True), ('2001:4860:4860::8888', True),
|
||||
('example.org', False), ('8.8.8.8\n', False), ('-d 8.8.8.8', False)):
|
||||
for path in private.iterdir():
|
||||
@@ -61,6 +69,23 @@ with tempfile.TemporaryDirectory(prefix='target-config-') as tmp:
|
||||
assert base['SS_PASSWORD'].encode() not in result.stdout + result.stderr
|
||||
if not valid:
|
||||
assert not list(private.iterdir())
|
||||
for overrides, valid in (
|
||||
({'ZAPRET_AUTOTUNE_RESOURCE_APPLY': '1'}, False),
|
||||
({'ZAPRET_AUTOTUNE_RESOURCE_APPLY': 'yes'}, False),
|
||||
({'ZAPRET_AUTOTUNE_RESOURCE_APPLY': '1', 'ZAPRET_AUTOTUNE_RESOURCE_CONFIG': '/private/resources.json'}, True),
|
||||
({'ZAPRET_AUTOTUNE_RESOURCE_APPLY': '1', 'ZAPRET_AUTOTUNE_RESOURCE_CONFIG': '/private/resources.json',
|
||||
'ZAPRET_AUTOTUNE_TARGET_ROLE': ''}, False),
|
||||
({'ZAPRET_AUTOTUNE_RESOURCE_APPLY': '1', 'ZAPRET_AUTOTUNE_RESOURCE_CONFIG': '/private/resources.json',
|
||||
'SOCKS_PORT': '1081'}, False),
|
||||
({'ZAPRET_AUTOTUNE_RESOURCE_APPLY': '1', 'ZAPRET_AUTOTUNE_RESOURCE_CONFIG': '/private/resources.json',
|
||||
'ZAPRET_AUTOTUNE_QUALIFY_CONFIG': '/private/resources.json', 'ZAPRET_AUTOTUNE_STRATEGY_CONFIG': '/private/strategies.json'}, False),
|
||||
):
|
||||
for path in private.iterdir():
|
||||
path.unlink()
|
||||
result = subprocess.run(['sh', str(entry)], env=dict(base, **overrides), capture_output=True, timeout=5)
|
||||
assert result.returncode == (0 if valid else 64), result.stderr
|
||||
if not valid:
|
||||
assert not list(private.iterdir()), 'Invalid apply mode created service configs'
|
||||
# Render privately, never print the config/password; config does not deploy.
|
||||
compose_env = {k: v for k, v in base.items() if not k.startswith('ZAPRET_AUTOTUNE_')}
|
||||
factory_cases = []
|
||||
@@ -100,6 +125,16 @@ with tempfile.TemporaryDirectory(prefix='target-config-') as tmp:
|
||||
factory_cases.append({'environment': {k: v for k, v in settings.items()
|
||||
if k.startswith('ZAPRET_AUTOTUNE_')}, 'ids': ids})
|
||||
# Validate the actual rendered DNS environment, not an invented equivalent.
|
||||
result = subprocess.run(['docker', 'compose', '--env-file', '/dev/null', '-f',
|
||||
str(ROOT / 'deploy/managed-target/compose.yaml'), 'config', '--format', 'json'],
|
||||
env=dict(compose_env, ZAPRET_AUTOTUNE_RESOURCE_APPLY='1',
|
||||
ZAPRET_AUTOTUNE_RESOURCE_CONFIG='/private/resources.json',
|
||||
ZAPRET_AUTOTUNE_STOP_GRACE_PERIOD='90s'), capture_output=True, timeout=10)
|
||||
assert result.returncode == 0, 'Generic Compose config failed (output suppressed)'
|
||||
target = json.loads(result.stdout)['services']['target']
|
||||
assert target['environment']['ZAPRET_AUTOTUNE_RESOURCE_APPLY'] == '1'
|
||||
assert target['environment']['ZAPRET_AUTOTUNE_RESOURCE_CONFIG'] == '/private/resources.json'
|
||||
assert target['stop_grace_period'] == '1m30s'
|
||||
# Compose must not inject Google bootstrap into a custom-provider request.
|
||||
for service in ('0', '1'):
|
||||
for provider in ({}, {'ZAPRET_AUTOTUNE_DOH_URL': 'https://secret.invalid/token'}):
|
||||
|
||||
@@ -55,7 +55,8 @@ assert "Docker administrators/root can still read container" in readme
|
||||
assert "removed\nfrom the entrypoint environment" in readme
|
||||
assert "No host networking" in readme
|
||||
assert ' restart: "no"\n' in compose
|
||||
assert " stop_grace_period: 240s\n" in compose
|
||||
assert " stop_grace_period: ${ZAPRET_AUTOTUNE_STOP_GRACE_PERIOD-240s}\n" in compose
|
||||
assert 'ZAPRET_AUTOTUNE_RESOURCE_APPLY: ${ZAPRET_AUTOTUNE_RESOURCE_APPLY-0}' in compose
|
||||
assert 'bounded_wait "$monitor_pid" 45' in entrypoint
|
||||
assert '/bin/sh /opt/managed-target-supervision.sh --watchdog' in entrypoint
|
||||
assert 'setsid /bin/sh /opt/managed-target-supervision.sh --monitor' in entrypoint
|
||||
@@ -77,6 +78,9 @@ for command, seconds in (("/usr/local/bin/zapret-autotune managed init", 45),
|
||||
assert entrypoint.index("managed reconcile || return 78") < entrypoint.index("zapret2 start || return 78")
|
||||
experimental = 'managed apply --googlevideo-experiment native-circular --googlevideo-scope experimental_googlevideo_suffix --googlevideo-request startup || exit 78'
|
||||
assert entrypoint.index('zapret2 start || return 78') < entrypoint.index(experimental)
|
||||
assert entrypoint.index(experimental) < entrypoint.index('setsid /bin/sh /opt/managed-target-supervision.sh --monitor')
|
||||
assert entrypoint.index(experimental) < entrypoint.index('launch_controller "$@" || return 78')
|
||||
generic_apply = 'launch_controller managed resource-apply --resource-config "$ZAPRET_AUTOTUNE_RESOURCE_CONFIG"'
|
||||
assert entrypoint.index('managed reconcile || return 78') < entrypoint.index(generic_apply) < entrypoint.index('zapret2 start || return 78')
|
||||
assert entrypoint.index(generic_apply) < entrypoint.index('set -- managed monitor')
|
||||
assert entrypoint.index('managed experimental-request-check || return 78') < entrypoint.index('managed init || return 78')
|
||||
assert 'rm "${ZAPRET_CONFIG%/*}/.autotune-experimental-suffix-request"' not in entrypoint
|
||||
@@ -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'):
|
||||
if seconds == 60 and scenario in ('generic-ss', 'generic-unsafe', 'generic-budget-monitor', 'generic-budget-reconcile', 'generic-budget-ack', 'generic-apply-blocked'):
|
||||
log('generic-pause')
|
||||
(root / 'budget-pause').touch()
|
||||
if scenario != 'generic-ss':
|
||||
@@ -325,6 +325,26 @@ elif command == 'monitor':
|
||||
time.sleep(.03)
|
||||
os.kill(os.getppid(), signal.SIGTERM)
|
||||
linger()
|
||||
elif command == 'resource-apply':
|
||||
assert sys.argv[3:] == ['--resource-config', '/operator/resources.json']
|
||||
assert os.environ['ZAPRET_AUTOTUNE_RESOURCE_APPLY'] == '1'
|
||||
assert os.getsid(0) == os.getpid(), 'apply lacks owned session'
|
||||
assert (root / 'private' / 'monitor-ready').read_text() == str(os.getpid()) + '\n'
|
||||
events = (root / 'events').read_text().splitlines()
|
||||
assert events[-1] == 'reconcile' and 'start' not in events
|
||||
log('resource-apply')
|
||||
if scenario == 'generic-apply-blocked':
|
||||
sys.exit(78)
|
||||
if scenario == 'generic-apply-cancel':
|
||||
def restored(*_):
|
||||
log('resource-restored')
|
||||
sys.exit(0)
|
||||
signal.signal(signal.SIGTERM, restored)
|
||||
os.kill(os.getppid(), signal.SIGTERM)
|
||||
while True:
|
||||
time.sleep(.01)
|
||||
log('resource-applied')
|
||||
sys.exit(0)
|
||||
'''
|
||||
|
||||
|
||||
@@ -368,7 +388,9 @@ def run(scenario, expected, dns='', mode='native'):
|
||||
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'
|
||||
assert loop in text
|
||||
text = text.replace(loop, barrier + loop, 1)
|
||||
# The apply child has its own wait loop before this monitor loop.
|
||||
before, after = text.rsplit(loop, 1)
|
||||
text = before + barrier + loop + after
|
||||
if realtime:
|
||||
# Private fixture scaling only: production has no configurable grace.
|
||||
text = text.replace('$(date +%s) + 80', '$(date +%s) + 12')
|
||||
@@ -384,6 +406,9 @@ def run(scenario, expected, dns='', mode='native'):
|
||||
env.pop('ZAPRET_AUTOTUNE_RESOURCE_CONFIG', None)
|
||||
env.pop('ZAPRET_AUTOTUNE_QUALIFY_CONFIG', None)
|
||||
env.pop('ZAPRET_AUTOTUNE_STRATEGY_CONFIG', None)
|
||||
env.pop('ZAPRET_AUTOTUNE_RESOURCE_APPLY', None)
|
||||
if scenario.startswith('generic-apply-'):
|
||||
env['ZAPRET_AUTOTUNE_RESOURCE_APPLY'] = '1'
|
||||
if scenario.startswith('qualify-'):
|
||||
env['ZAPRET_AUTOTUNE_QUALIFY_CONFIG'] = '/operator/resources.json'
|
||||
if scenario != 'qualify-missing':
|
||||
@@ -412,6 +437,7 @@ def run(scenario, expected, dns='', mode='native'):
|
||||
peer.wait(timeout=2)
|
||||
events = (root / 'events').read_text().splitlines() if (root / 'events').exists() else []
|
||||
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
|
||||
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)
|
||||
@@ -428,7 +454,7 @@ def run(scenario, expected, dns='', mode='native'):
|
||||
# Every activation and stop must immediately follow successful reconcile.
|
||||
for i, event in enumerate(events):
|
||||
if event in ('start', 'stop'):
|
||||
assert events[i - 1] == 'reconcile', (scenario, events)
|
||||
assert events[i - 1] == 'reconcile' or event == 'start' and events[i - 1] == 'resource-applied', (scenario, events)
|
||||
foreign = scenario in ('dns-symlink', 'dns-preack-foreign', 'dns-replace', 'dns-replace-symlink', 'dns-stale', 'dns-stale-symlink')
|
||||
if foreign:
|
||||
ready = configs / 'dns-ready'
|
||||
@@ -472,6 +498,14 @@ assert events.count('generic-pause') == 1, events
|
||||
assert events.count('dns-start') == events.count('dns-stop') == 4, events
|
||||
events = run('generic-unsafe', 0)
|
||||
assert 'start' not in events and events.count('generic-pause') == 1, events
|
||||
events = run('generic-apply-pass', 0, mode='doh')
|
||||
assert events.count('resource-apply') == 1 and events.count('start') == 1, events
|
||||
assert events.index('resource-applied') < events.index('start') < events.index('monitor 1'), events
|
||||
events = run('generic-apply-cancel', 0, mode='doh')
|
||||
assert 'resource-restored' in events and 'start' not in events and 'monitor 1' not in events, events
|
||||
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 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)
|
||||
@@ -566,10 +600,47 @@ esac
|
||||
assert not Path(f'/proc/{pid}').exists(), (shell, mode, 'orphan sleeper', pid)
|
||||
|
||||
|
||||
def check_session_deadline(shell):
|
||||
"""Startup sweep has no aggregate deadline; termination must keep its cap."""
|
||||
entrypoint = (ROOT / 'managed-target-entrypoint.sh').read_text()
|
||||
cleanup_session = entrypoint[entrypoint.index('cleanup_session() {'):entrypoint.index('capture_monitor_session() {')]
|
||||
for deadline, live_until, expected, elapsed in (('', 102, 0, 2), ('180', 102, 0, 2), ('101', 110, 78, 1)):
|
||||
with tempfile.TemporaryDirectory(prefix='session-deadline-') as tmp:
|
||||
script = Path(tmp) / 'check.sh'
|
||||
script.write_text(f'''set -eu
|
||||
generic_mode=1
|
||||
generic_cleanup_deadline='{deadline}'
|
||||
monitor_sid=42
|
||||
clock=100
|
||||
date() {{ printf '%s\\n' "$clock"; }}
|
||||
pause() {{ clock=$((clock + $1)); }}
|
||||
signal_session() {{
|
||||
[ "$1" = 42 ] || return 78
|
||||
case "$2" in
|
||||
TERM|KILL) ;;
|
||||
CHECK) session_live=1; [ "$clock" -lt {live_until} ] || session_live=0 ;;
|
||||
*) return 78 ;;
|
||||
esac
|
||||
}}
|
||||
{cleanup_session}
|
||||
code=0
|
||||
cleanup_session || code=$?
|
||||
[ "$code" -eq {expected} ]
|
||||
[ "$clock" -eq {100 + elapsed} ]
|
||||
[ "$generic_cleanup_deadline" = '{deadline}' ]
|
||||
''')
|
||||
result = subprocess.run([*shell, str(script)], capture_output=True, timeout=2)
|
||||
assert result.returncode == 0, (shell, deadline, result.stderr)
|
||||
expected_stderr = b'error: owned monitor session survived cleanup\n' if expected else b''
|
||||
assert result.stderr == expected_stderr, (shell, deadline, result.stderr)
|
||||
|
||||
|
||||
check_watchdog_traps(['/bin/sh'])
|
||||
check_session_deadline(['/bin/sh'])
|
||||
busybox = shutil.which('busybox')
|
||||
if busybox:
|
||||
check_watchdog_traps([busybox, 'ash'])
|
||||
check_session_deadline([busybox, 'ash'])
|
||||
for pid, seconds in (('1', '5'), ('0', '5'), ('-1', '5'), ('42', '0'), ('42', 'bad')):
|
||||
result = subprocess.run(['/bin/sh', str(ROOT / 'managed-target-supervision.sh'), '--watchdog', pid, seconds, '/'], capture_output=True, timeout=2)
|
||||
assert result.returncode == 64
|
||||
|
||||
@@ -19,6 +19,7 @@ services:
|
||||
ZAPRET_AUTOTUNE_DOH_TIMEOUT_SEC: ${ZAPRET_AUTOTUNE_DOH_TIMEOUT_SEC-5}
|
||||
ZAPRET_AUTOTUNE_YOUTUBE_SERVICE: ${ZAPRET_AUTOTUNE_YOUTUBE_SERVICE-0}
|
||||
ZAPRET_AUTOTUNE_RESOURCE_CONFIG: ${ZAPRET_AUTOTUNE_RESOURCE_CONFIG-}
|
||||
ZAPRET_AUTOTUNE_RESOURCE_APPLY: ${ZAPRET_AUTOTUNE_RESOURCE_APPLY-0}
|
||||
# INTRUSIVE isolated startup batch. Never route working traffic here.
|
||||
ZAPRET_AUTOTUNE_QUALIFY_CONFIG: ${ZAPRET_AUTOTUNE_QUALIFY_CONFIG-}
|
||||
ZAPRET_AUTOTUNE_STRATEGY_CONFIG: ${ZAPRET_AUTOTUNE_STRATEGY_CONFIG-}
|
||||
@@ -45,7 +46,8 @@ services:
|
||||
- /run/zapret-autotune-ss:rw,noexec,nosuid,nodev,size=1m,mode=0700,uid=0,gid=0
|
||||
networks: [target]
|
||||
restart: "no"
|
||||
stop_grace_period: 240s
|
||||
# Generic mode uses 90s; retain the legacy adapter's longer default.
|
||||
stop_grace_period: ${ZAPRET_AUTOTUNE_STOP_GRACE_PERIOD-240s}
|
||||
sysctls:
|
||||
net.ipv4.ip_unprivileged_port_start: "0"
|
||||
networks:
|
||||
|
||||
Reference in new issue
Block a user