salvage 2026-11-06: uncommitted work from scratch/rocko-r219 (disk cleanup #824)

This commit is contained in:
mos committed 2026-11-06 10:05:52 -06:00
1 parent 06d7cc2f0f
commit bf3137b2ee
5 files changed
+29 -12

No files matched your search

+15
View File
@@ -340,3 +340,18 @@ push only after authorized. Estimate3-5min. No tests/mutants/Node/push until
Sage CLEAR. Dewey delta review follows; later full no-carry restart includes
all10 changed files, bus/cli/webui, all10 shells, all24 mutants and reader
control/audit. Further old-test red stops and goes to Mos through Sage.
## Full restart r5: sage-3313 / post-302 merge
Merged b899095e4 onto 07802dc57ad36337351da70af15c447bea38ab8b, clean, merge 06d7cc2f0ffc544abfb2755f99dce76ca164212c.
Both row302 and row219 changes in broker.mjs and threads.test.mjs retained
by the automatic merge; no manual product/test edits. New 16-path manifest
420befed0aa8291736d34187ac7e745b7660efed15348ece045a7dd8957c9124.
No previous runs carried. All 10 whole touched files, bus/cli/webui/harness
suites, all shell files, 24 mutants, reader audit. Fresh short TMPDIR per
stage, process groups, timeout -k 10; previous time limits remain.
Packet runner now writes a fresh run-0780-mos1429 directory and includes
harness explicitly. It classifies GNU timeout exit 124/137 or signal -9 as
timeout too, so a timed-out mutant can never be called assertion-killed.
No mutation/test/product changes for that runner classification correction.
Every old-test red (including compactions-launch:229) stops for Mos.
+1 -1
View File
@@ -1 +1 @@
80793d824e05baaef4820f4be7790aba55971b6f
07802dc57ad36337351da70af15c447bea38ab8b
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/packages/bus/src/broker.mjs b/packages/bus/src/broker.mjs
index d76085739..11061c778 100644
index b05922479..4c59c3a4a 100644
--- a/packages/bus/src/broker.mjs
+++ b/packages/bus/src/broker.mjs
@@ -4,7 +4,7 @@ import { initializeControl, processingStatus } from '../../processing-control/sr
@@ -20,7 +20,7 @@ index d76085739..11061c778 100644
// user in threads. Its runs claim a thread, not the role, and every message to or from it names its
// thread (REQ-MSG-1).
// Row 146 (#1640): the sender of the bus's notice to launch.by. A role instance name matches the
@@ -598,7 +598,7 @@ export class Broker {
@@ -602,7 +602,7 @@ export class Broker {
);
}
#threaded(business, role) {
@@ -29,7 +29,7 @@ index d76085739..11061c778 100644
}
// Row 264a (#1769): a claim holds one session of a thread, and each session has its own holder.
#sessionHolder(session) {
@@ -6068,24 +6068,27 @@ export class Broker {
@@ -6079,24 +6079,27 @@ export class Broker {
.all('SELECT id,at,name,repo FROM projects WHERE business=? ORDER BY seq', s.business)
.filter((p) => !s.user || this.#granted(s, 'project.list', p.id, null));
}
@@ -65,7 +65,7 @@ index d76085739..11061c778 100644
if (this.#store.get('SELECT 1 FROM threads WHERE project=? AND name=?', a.project, a.name)) fail('thread-exists');
const tid = randomUUID();
this.#store.run(
@@ -6094,13 +6097,13 @@ export class Broker {
@@ -6105,13 +6108,13 @@ export class Broker {
this.#now(),
s.business,
a.project,
@@ -157,7 +157,7 @@ index a6086e56c..7275ad902 100644
assert.doesNotMatch(source, /\bimport\s*\(/);
assert.doesNotMatch(readFileSync(new URL('../src/landing.mjs', import.meta.url), 'utf8'), /\bimport\b/);
diff --git a/packages/bus/tests/threads.test.mjs b/packages/bus/tests/threads.test.mjs
index 8b31da9f9..280e03184 100644
index 27193a745..ae44fb66a 100644
--- a/packages/bus/tests/threads.test.mjs
+++ b/packages/bus/tests/threads.test.mjs
@@ -601,3 +601,56 @@ test('project.create keeps unrelated names with and without a repository', t =>
@@ -1,8 +1,8 @@
142a210882535108159e045c61be288bc8703910a8ee0169137bc1eb80baff64 packages/bus/src/broker.mjs
f21daf94d057341f8f9f55ec65fcc16a7d6774311c1ca5b1ab336fc2a9e086e2 packages/bus/src/broker.mjs
b0c66c8999b567896923f6c876911dba936c6eca1ccc7aaeada51369fd613594 packages/bus/tests/creative.test.mjs
3efd0238da60e0bfcd3b25e5256b9c213085119a86a7b852b13e7a60340d3a24 packages/bus/tests/grant-executor.test.mjs
b7ea857637947c7a9ca45c56cea47e37e06f0fd8446ea91316990d9fa7299a7a packages/bus/tests/project-runtime.test.mjs
264d82944c53b638bf6a14cc0706cf9ba184d668211c2b9c1031cdbe88e84bb9 packages/bus/tests/threads.test.mjs
760c4a5dc2881a47be2a174f92c4fcb1b6e46abb299cb045a2e3dcbc485fb334 packages/bus/tests/threads.test.mjs
8f7d6745fffb2a0898ac80c012084ac48964748da6439a8c56facc6529ffb19b packages/bus/tests/user-principal.test.mjs
b74275ce43249bafc97edc87a6a3aa0431c62fe1a28cd9fa265246e6d6da219b packages/cli/src/launcher.mjs
2c3f120dfdc0b52bf8ab38a88e86251be75d4b0d218e23df489dcaf815d6bc15 packages/cli/tests/launcher.test.mjs
+6 -4
View File
@@ -5,7 +5,7 @@ from pathlib import Path
from datetime import datetime,timezone
ROOT=Path(__file__).resolve().parents[4]
PACKET=Path(__file__).resolve().parent
OUT=PACKET/'run-4a9c-mos1408';OUT.mkdir(exist_ok=True)
OUT=PACKET/'run-0780-mos1432';OUT.mkdir(exist_ok=True)
def stamp():return datetime.now(timezone.utc).isoformat()
def verify():
for line in (PACKET/'candidate-manifest.sha256').read_text().splitlines():
@@ -22,7 +22,8 @@ def sweep():
def execute(label,args,cwd=ROOT,deadline=300,docker=False):
if args[0]=='node' and '--test' in args and '--test-reporter=tap' not in args:args=[args[0],'--test-reporter=tap',*args[1:]]
if args[0]!='timeout':args=['timeout','-k','10',str(deadline),*args]
verify();short=tempfile.mkdtemp(prefix='r',dir='/mnt/storage/scratch/tmp')
verify();short=subprocess.check_output(['mktemp','-d','/mnt/storage/scratch/tmp/rXXXXXX'],text=True).strip()
if not re.fullmatch(r'[A-Za-z0-9/.-]+',short):raise RuntimeError('unsafe TMPDIR charset')
env=os.environ.copy();env.update(TMPDIR=short,NO_COLOR='1',COMPOSE_PROJECT_NAME='rocko-r219-gate')
env.pop('MOSAIC_GITEA_CREDENTIAL_FILE',None);env.pop('MOSAIC_LIVE_PROVIDER',None)
if docker:env.pop('DOCKER_HOST',None)
@@ -45,9 +46,10 @@ def execute(label,args,cwd=ROOT,deadline=300,docker=False):
finally:
try:os.killpg(child.pid,signal.SIGTERM)
except ProcessLookupError:pass
timeout = timeout or rc in (124,137,-9)
text=log.read_text(errors='replace')
counts={k:int(m[-1]) if (m:=re.findall(r'^# '+k+r' (\d+)\s*$',text,re.M)) else None for k in ['tests','pass','fail','cancelled','skipped']}
row=dict(label=label,args=args,start=begin,end=stamp(),seconds=round(time.monotonic()-t,3),exit=rc,timeout=timeout,counts=counts,skips=[l for l in text.splitlines() if re.search(r'^skip|# SKIP',l,re.I)],log=str(log.relative_to(ROOT)),tmpdir=short)
row=dict(label=label,args=args,start=begin,end=stamp(),seconds=round(time.monotonic()-t,3),exit=rc,timeout=timeout,counts=counts,skips=[l for l in text.splitlines() if re.search(r'^skip\b|# SKIP\b',l,re.I)],log=str(log.relative_to(ROOT)),tmpdir=short)
with (OUT/'results.jsonl').open('a') as f:f.write(json.dumps(row)+'\n')
print('END',json.dumps(row),flush=True)
if rc or timeout or re.search(r'^\s*not ok\b',text,re.M):raise RuntimeError('RED '+label+' '+str(log))
@@ -55,7 +57,7 @@ def execute(label,args,cwd=ROOT,deadline=300,docker=False):
singles=[line for line in (PACKET/'changed-paths.txt').read_text().splitlines() if '/tests/' in line]
def stages():
for path in singles:execute('single-'+Path(path).parent.parent.name+'-'+Path(path).stem,['node','--test',path],deadline=300)
for package in ['bus','cli','webui']:
for package in ['bus','cli','webui','harness']:
files=sorted(glob.glob(str(ROOT/'packages'/package/'tests'/'*.test.mjs')))
execute('suite-'+package,['node','--test',*files],cwd=ROOT/'packages'/package,deadline=1800)
for path in sorted(ROOT.glob('scripts/test-*.sh')):