forked from mtusi2026/mtusi2026lab4
completed lab4
This commit is contained in:
Executable
+21
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create local-only secret files once; do not print their values."""
|
||||
from pathlib import Path
|
||||
import secrets
|
||||
root=Path(__file__).resolve().parents[1]
|
||||
d=root/'secrets'; d.mkdir(mode=0o700,exist_ok=True); d.chmod(0o700)
|
||||
def ensure(name,value):
|
||||
p=d/name
|
||||
if not p.exists(): p.write_text(value)
|
||||
p.chmod(0o600)
|
||||
ensure('db_password',secrets.token_urlsafe(32))
|
||||
ensure('rustfs_root_user','RUSTFSROOT')
|
||||
ensure('rustfs_root_password',secrets.token_urlsafe(32))
|
||||
ensure('s3_access_key_id','messengerapi')
|
||||
ensure('s3_secret_access_key',secrets.token_urlsafe(40))
|
||||
p=d/'database_url'; ensure('database_url','postgresql://messenger:'+ (d/'db_password').read_text().strip()+'@postgres:5432/messenger')
|
||||
ensure('cache_url','redis://redis:6379/0')
|
||||
env=root/'.env'
|
||||
if not env.exists(): env.write_text('API_REPLICAS=2\nSESSION_TTL_SECONDS=3600\n')
|
||||
env.chmod(0o600)
|
||||
print('Local secrets created or preserved; values hidden.')
|
||||
Executable
+59
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Safe S3/PostgreSQL attachment inventory. Dry-run unless --apply is specified."""
|
||||
import argparse
|
||||
import datetime as dt
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import time
|
||||
import boto3
|
||||
from botocore.config import Config
|
||||
import psycopg
|
||||
from psycopg.rows import dict_row
|
||||
sys.path.insert(0,str(Path(__file__).resolve().parents[1]))
|
||||
from app.migrate import setting
|
||||
|
||||
def main():
|
||||
p=argparse.ArgumentParser(description=__doc__)
|
||||
p.add_argument('--apply',action='store_true',help='delete only unreferenced S3 objects older than the grace period')
|
||||
p.add_argument('--grace-seconds',type=int,default=86400)
|
||||
p.add_argument('--allow-short-grace',action='store_true',help='test-only override; use only with a dedicated --prefix')
|
||||
p.add_argument('--prefix',default='',help='restrict the scan and repair to one S3 prefix')
|
||||
a=p.parse_args()
|
||||
if a.grace_seconds<3600 and not (a.allow_short_grace and a.prefix): p.error('grace period must be at least 3600 seconds unless test-only override and a prefix are both supplied')
|
||||
endpoint=os.getenv('S3_ENDPOINT','http://rustfs:9000'); bucket=os.getenv('S3_BUCKET','messenger-attachments')
|
||||
started=time.monotonic()
|
||||
key=setting('S3_ACCESS_KEY_ID'); secret=setting('S3_SECRET_ACCESS_KEY')
|
||||
s3=boto3.client('s3',endpoint_url=endpoint,region_name=os.getenv('S3_REGION','us-east-1'),aws_access_key_id=key,aws_secret_access_key=secret,config=Config(connect_timeout=3,read_timeout=10,retries={'max_attempts':2}))
|
||||
with psycopg.connect(setting('DATABASE_URL'),row_factory=dict_row,connect_timeout=3) as db:
|
||||
if a.prefix:
|
||||
rows=db.execute('SELECT id,object_key,created_at FROM attachments WHERE object_key LIKE %s',(a.prefix.replace('\\','\\\\').replace('%','\\%').replace('_','\\_')+'%',)).fetchall()
|
||||
else:
|
||||
rows=db.execute('SELECT id,object_key,created_at FROM attachments').fetchall()
|
||||
by_key={r['object_key']:r for r in rows}
|
||||
objects=[]; token=None
|
||||
while True:
|
||||
args={'Bucket':bucket,'MaxKeys':1000}
|
||||
if a.prefix: args['Prefix']=a.prefix
|
||||
if token: args['ContinuationToken']=token
|
||||
page=s3.list_objects_v2(**args)
|
||||
objects.extend(page.get('Contents',[]))
|
||||
if not page.get('IsTruncated'): break
|
||||
token=page['NextContinuationToken']
|
||||
object_keys={o['Key'] for o in objects}
|
||||
missing=sorted(k for k in by_key if k not in object_keys)
|
||||
now=dt.datetime.now(dt.timezone.utc); cutoff=now-dt.timedelta(seconds=a.grace_seconds)
|
||||
orphan=[o for o in objects if o['Key'] not in by_key]
|
||||
eligible=[o for o in orphan if o['LastModified']<cutoff]
|
||||
deleted=[]
|
||||
if a.apply:
|
||||
for o in eligible:
|
||||
# Recheck the reference immediately before deletion to reduce the race with an upload/commit.
|
||||
with psycopg.connect(setting('DATABASE_URL'),connect_timeout=3) as db:
|
||||
exists=db.execute('SELECT 1 FROM attachments WHERE object_key=%s',(o['Key'],)).fetchone()
|
||||
if exists: continue
|
||||
s3.delete_object(Bucket=bucket,Key=o['Key']); deleted.append(o['Key'])
|
||||
report={'mode':'apply' if a.apply else 'dry-run','bucket':bucket,'prefix':a.prefix or None,'db_rows':len(rows),'s3_objects':len(objects),'missing_objects':missing,'orphan_objects':[o['Key'] for o in orphan],'eligible_orphans':[o['Key'] for o in eligible],'deleted_objects':deleted,'grace_seconds':a.grace_seconds,'elapsed_seconds':round(time.monotonic()-started,4),'safe_policy':'missing referenced objects are reported only; only unreferenced objects older than grace can be deleted'}
|
||||
print(json.dumps(report,indent=2))
|
||||
if __name__=='__main__': main()
|
||||
Executable
+46
@@ -0,0 +1,46 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Repeatable, prefix-isolated orphan/missing reconciler experiment (lab use only)."""
|
||||
import hashlib, json, subprocess, sys, time, uuid
|
||||
from pathlib import Path
|
||||
sys.path.insert(0,str(Path(__file__).resolve().parents[1]))
|
||||
from app.main import bucket, pool, s3
|
||||
|
||||
prefix='reconcile-experiment-'+uuid.uuid4().hex+'/'
|
||||
missing_key=prefix+'missing.png'; orphan_key=prefix+'orphan.bin'
|
||||
with pool.connection() as c:
|
||||
chat=c.execute('SELECT c.id,m.user_id FROM chats c JOIN members m ON m.chat_id=c.id LIMIT 1').fetchone()
|
||||
if not chat: raise SystemExit('Create one chat before running this experiment')
|
||||
sentinel=c.execute("SELECT id,object_key,sha256 FROM attachments WHERE status='ready' ORDER BY created_at DESC LIMIT 1").fetchone()
|
||||
if not sentinel: raise SystemExit('Upload one valid attachment before running this experiment')
|
||||
sid=str(sentinel['id']); skey=sentinel['object_key']; expected=sentinel['sha256'].strip()
|
||||
sentinel_before=s3.get_object(Bucket=bucket,Key=skey)['Body'].read()
|
||||
if hashlib.sha256(sentinel_before).hexdigest()!=expected: raise RuntimeError('sentinel attachment checksum mismatch before experiment')
|
||||
script=Path(__file__).with_name('reconcile.py')
|
||||
def reconcile(*args):
|
||||
r=subprocess.run([sys.executable,str(script),'--prefix',prefix,*args],capture_output=True,text=True,check=True)
|
||||
return json.loads(r.stdout)
|
||||
try:
|
||||
with pool.connection() as c:
|
||||
c.execute("INSERT INTO attachments(id,chat_id,owner_id,object_key,filename,content_type,size_bytes,sha256,status) VALUES (%s,%s,%s,%s,%s,'image/png',1,%s,'ready')",(uuid.uuid4(),chat['id'],chat['user_id'],missing_key,'missing.png','0'*64))
|
||||
s3.put_object(Bucket=bucket,Key=orphan_key,Body=b'reconciler experiment orphan')
|
||||
dry=reconcile()
|
||||
if dry['missing_objects']!=[missing_key] or dry['orphan_objects']!=[orphan_key] or dry['deleted_objects']:
|
||||
raise RuntimeError('dry-run did not report both injected faults without mutation')
|
||||
fresh_apply=reconcile('--grace-seconds','3600','--apply')
|
||||
if fresh_apply['eligible_orphans'] or fresh_apply['deleted_objects'] or fresh_apply['s3_objects']!=1:
|
||||
raise RuntimeError('apply deleted an orphan before the grace period')
|
||||
time.sleep(2.1)
|
||||
applied=reconcile('--grace-seconds','1','--allow-short-grace','--apply')
|
||||
if applied['deleted_objects']!=[orphan_key] or applied['missing_objects']!=[missing_key]:
|
||||
raise RuntimeError('apply result did not match scoped safety policy')
|
||||
repeated=reconcile('--grace-seconds','1','--allow-short-grace')
|
||||
if repeated['orphan_objects'] or repeated['missing_objects']!=[missing_key]:
|
||||
raise RuntimeError('repeat dry-run is not stable')
|
||||
sentinel_after=s3.get_object(Bucket=bucket,Key=skey)['Body'].read()
|
||||
if hashlib.sha256(sentinel_after).hexdigest()!=expected or sentinel_after!=sentinel_before:
|
||||
raise RuntimeError('pre-existing attachment changed during reconciliation')
|
||||
print(json.dumps({'prefix':prefix,'faults_injected':{'missing_metadata_object':missing_key,'unreferenced_s3_object':orphan_key},'dry_run':dry,'fresh_orphan_apply':fresh_apply,'aged_orphan_apply':applied,'repeat_dry_run':repeated,'sentinel_attachment_preserved':True,'sentinel_sha256':expected},indent=2))
|
||||
finally:
|
||||
with pool.connection() as c: c.execute('DELETE FROM attachments WHERE object_key=%s',(missing_key,))
|
||||
try: s3.delete_object(Bucket=bucket,Key=orphan_key)
|
||||
except Exception: pass
|
||||
Executable
+6
@@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
# Recreate real containers, retain PostgreSQL volume. No migration race.
|
||||
docker compose down
|
||||
docker compose up -d --no-build --pull never --wait --wait-timeout 90
|
||||
Executable
+16
@@ -0,0 +1,16 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
: "${TARGET_INSTANCE_ID:?Set TARGET_INSTANCE_ID from a real API response}"
|
||||
for id in $(docker compose ps -q api); do
|
||||
host=$(docker inspect -f '{{.Config.Hostname}}' "$id")
|
||||
case "$TARGET_INSTANCE_ID" in
|
||||
"$host"-*)
|
||||
printf 'Stopping API container %s (hostname %s)\n' "$id" "$host"
|
||||
docker stop --time 5 "$id"
|
||||
docker inspect -f '{{.Id}} {{.State.Status}}' "$id"
|
||||
exit 0;;
|
||||
esac
|
||||
done
|
||||
printf 'No running API matches target\n' >&2
|
||||
exit 1
|
||||
Reference in New Issue
Block a user