Daan MeijerandClaude Opus 5.5
9dc0a27bb4
A lease was only granted for a range with spooled chunks, and the prefetcher kept ranges ahead per active lease: once the spool ran dry a worker got none and slept 30 s, fewer ranges were leased, fewer prefetched. Three workers held one lease between them (~50k headers/s). A lease now takes a spooled range first, else the next planned one (leased ranges are fetched first; the stream waits). crypto.hash instead of createHash().update().digest() for file and release keys: same digests, ~2.5x faster (~4.6% of a worker's time). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
69 lines
3.3 KiB
TypeScript
69 lines
3.3 KiB
TypeScript
import db from '@adonisjs/lucid/services/db'
|
|
import coordinatorConfig from '#config/coordinator'
|
|
import RuleSets from '#services/rule_sets'
|
|
import Spool from '#services/spool'
|
|
import type { Lease } from '#lib/edge/index'
|
|
|
|
export class LeaseLost extends Error {}
|
|
|
|
/**
|
|
* Ranges for workers (REBUILD.md, coordinator): the next range with chunks
|
|
* spooled, by priority (oldest era first), else the next planned one (the
|
|
* prefetcher fetches leased ranges first; the worker's stream waits). A
|
|
* worker never waits for prefetching to choose its range: refused leases
|
|
* left workers idle for 30 s, so fewer ranges were leased and fewer
|
|
* prefetched (LOG.md 2026-10-09). A lease whose worker went quiet for
|
|
* LEASE_TTL_SECONDS is taken over and resumes at its resume point.
|
|
*/
|
|
class Leases {
|
|
async lease(nodeId: number): Promise<Lease | null> {
|
|
const rules = await RuleSets.current()
|
|
const take = (spooled: boolean) =>
|
|
db.rawQuery(
|
|
`UPDATE ranges r SET status = 'leased', node_id = ?, leased_at = now(), heartbeat_at = now(), attempts = attempts + 1, rule_version = ?
|
|
WHERE r.id = (
|
|
SELECT id FROM ranges
|
|
WHERE ${spooled ? 'spooled_chunks > 0' : 'true'} AND next_id <= end_id
|
|
AND (status = 'planned' OR (status = 'leased' AND heartbeat_at < now() - make_interval(secs => ?)))
|
|
ORDER BY priority, id LIMIT 1 FOR UPDATE SKIP LOCKED)
|
|
RETURNING r.id, r.group_id, r.start_id, r.end_id, r.next_id`,
|
|
[nodeId, rules.version, coordinatorConfig.leaseTtlSeconds]
|
|
)
|
|
let { rows } = await take(true)
|
|
if (rows.length === 0) ({ rows } = await take(false))
|
|
const row = rows[0]
|
|
if (!row) return null
|
|
await db.from('nodes').where('id', nodeId).update({ last_seen_at: new Date() })
|
|
const group = await db.from('groups').where('id', row.group_id).select('name').firstOrFail()
|
|
return { range: { id: Number(row.id), group: group.name, start: Number(row.start_id), end: Number(row.end_id), next: Number(row.next_id) }, rules }
|
|
}
|
|
|
|
async leased(rangeId: number, nodeId: number) {
|
|
const range = await db.from('ranges').where('id', rangeId).first()
|
|
if (!range || range.status !== 'leased' || Number(range.node_id) !== nodeId) throw new LeaseLost(`Range ${rangeId} is not leased to this node`)
|
|
return range
|
|
}
|
|
|
|
async heartbeat(rangeId: number, nodeId: number) {
|
|
await this.leased(rangeId, nodeId)
|
|
await db.from('ranges').where('id', rangeId).update({ heartbeat_at: new Date() })
|
|
await db.from('nodes').where('id', nodeId).update({ last_seen_at: new Date() })
|
|
}
|
|
|
|
/** The worker reached the range's end: done, and its spooled chunks go. */
|
|
async finish(rangeId: number, nodeId: number) {
|
|
const range = await this.leased(rangeId, nodeId)
|
|
if (Number(range.next_id) <= Number(range.end_id)) throw new LeaseLost(`Range ${rangeId} is at ${range.next_id}, not past its end ${range.end_id}`)
|
|
await db.from('ranges').where('id', rangeId).update({ status: 'done', done_at: new Date(), heartbeat_at: new Date() })
|
|
await Spool.remove(rangeId)
|
|
}
|
|
|
|
/** A stopping worker gives its range back; the next one resumes it. */
|
|
async release(rangeId: number, nodeId: number) {
|
|
await this.leased(rangeId, nodeId)
|
|
await db.from('ranges').where('id', rangeId).update({ status: 'planned', node_id: null })
|
|
}
|
|
}
|
|
|
|
export default new Leases()
|