Initial text cleanup
This commit is contained in:
10
Dockerfile
10
Dockerfile
@@ -3,15 +3,15 @@
|
|||||||
# The runtime image carries only what serving needs: the Julia runtime, a depot
|
# The runtime image carries only what serving needs: the Julia runtime, a depot
|
||||||
# that is already instantiated *and* precompiled (so startup is load-only, no
|
# that is already instantiated *and* precompiled (so startup is load-only, no
|
||||||
# compilation), exiftool, and optionally github-linguist. Nothing from the build
|
# compilation), exiftool, and optionally github-linguist. Nothing from the build
|
||||||
# — no compilers, no package registry, no gem toolchain — survives into it.
|
# survives into it: no compilers, no package registry, no gem toolchain.
|
||||||
#
|
#
|
||||||
# docker build -t file-server .
|
# docker build -t file-server .
|
||||||
# docker build --build-arg WITH_LINGUIST=false -t file-server . # ~200MB smaller
|
# docker build --build-arg WITH_LINGUIST=false -t file-server . # ~200MB smaller
|
||||||
#
|
#
|
||||||
# github-linguist (stage-4 programming-language detection) is the one heavy
|
# github-linguist (stage-4 programming-language detection) is the one heavy
|
||||||
# optional dependency: it needs a Ruby toolchain to build rugged. It degrades
|
# optional dependency: it needs a Ruby toolchain to build rugged. It degrades
|
||||||
# gracefully — without it, text files still get natural-language enrichment and
|
# gracefully: without it, text files still get natural-language enrichment and
|
||||||
# the server logs a warning at startup — so it can be built out.
|
# the server logs a warning at startup, so it can be built out.
|
||||||
|
|
||||||
ARG JULIA_VERSION=1.12.6
|
ARG JULIA_VERSION=1.12.6
|
||||||
ARG DEBIAN_RELEASE=bookworm
|
ARG DEBIAN_RELEASE=bookworm
|
||||||
@@ -29,7 +29,7 @@ WORKDIR /app
|
|||||||
|
|
||||||
# Manifest-first so a source-only edit doesn't re-resolve or rebuild the whole
|
# Manifest-first so a source-only edit doesn't re-resolve or rebuild the whole
|
||||||
# dependency tree. FileServer is its own project's root package, so Pkg insists
|
# dependency tree. FileServer is its own project's root package, so Pkg insists
|
||||||
# on a module file being there — a stub satisfies it while the (slow, rarely
|
# on a module file being there; a stub satisfies it while the (slow, rarely
|
||||||
# invalidated) dependency layer is built; the real source lands below.
|
# invalidated) dependency layer is built; the real source lands below.
|
||||||
COPY Project.toml Manifest.toml ./
|
COPY Project.toml Manifest.toml ./
|
||||||
RUN mkdir -p src \
|
RUN mkdir -p src \
|
||||||
@@ -55,7 +55,7 @@ RUN rm -rf /opt/julia-depot/registries \
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Stage 2: build github-linguist into a relocatable GEM_HOME (optional).
|
# Stage 2: build github-linguist into a relocatable GEM_HOME (optional).
|
||||||
#
|
#
|
||||||
# Built against Debian's system Ruby — the same package the runtime installs —
|
# Built against Debian's system Ruby, the same package the runtime installs,
|
||||||
# so rugged's native extension is ABI-compatible with the interpreter there.
|
# so rugged's native extension is ABI-compatible with the interpreter there.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
FROM debian:${DEBIAN_RELEASE}-slim AS linguist
|
FROM debian:${DEBIAN_RELEASE}-slim AS linguist
|
||||||
|
|||||||
270
README.md
270
README.md
@@ -3,11 +3,11 @@
|
|||||||
A minimal Julia service that receives files over HTTP and hands them off to a
|
A minimal Julia service that receives files over HTTP and hands them off to a
|
||||||
pool of worker threads for processing. The HTTP endpoint does no real work: it
|
pool of worker threads for processing. The HTTP endpoint does no real work: it
|
||||||
spools each uploaded file to disk, pushes a lightweight reference onto a work
|
spools each uploaded file to disk, pushes a lightweight reference onto a work
|
||||||
queue, and responds immediately — staying free to accept the next upload.
|
queue, and responds immediately, staying free to accept the next upload.
|
||||||
|
|
||||||
The per-file "processing" runs each file through a small neural-network
|
The per-file processing is deliberately thin. Each file runs through a small
|
||||||
classifier that labels it **known** (a file type resembling the training set) or
|
neural-network classifier that labels it **known** (a file type resembling the
|
||||||
**unknown**, and logs the result. See "File classifier" below.
|
training set) or **unknown**, and logs the result. See "File classifier" below.
|
||||||
|
|
||||||
## Architecture
|
## Architecture
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ enrichment mixes CPU with a subprocess):
|
|||||||
classify wkr 1 classify wkr 2 … classify wkr N
|
classify wkr 1 classify wkr 2 … classify wkr N
|
||||||
│
|
│
|
||||||
┌────────────┴────────────┐
|
┌────────────┴────────────┐
|
||||||
:unknown :known the file itself never moves —
|
:unknown :known the file itself never moves;
|
||||||
│ │ routing is the enqueue alone
|
│ │ routing is the enqueue alone
|
||||||
│ enqueue (blocking) │ enqueue (blocking backpressure)
|
│ enqueue (blocking) │ enqueue (blocking backpressure)
|
||||||
▼ ▼
|
▼ ▼
|
||||||
@@ -65,15 +65,15 @@ enrichment mixes CPU with a subprocess):
|
|||||||
(sidecar-first commit)
|
(sidecar-first commit)
|
||||||
```
|
```
|
||||||
|
|
||||||
A file is written **once**, into `data/spool/`, and stays there for its entire
|
A file is written once, into `data/spool/`, and stays there for its entire time
|
||||||
time in the pipeline. Stages hand it on by enqueueing its small `Job` reference,
|
in the pipeline. Stages hand it on by enqueueing its small `Job` reference, never
|
||||||
never by moving bytes — the queue holding the reference *is* the record of which
|
by moving bytes: the queue holding the reference *is* the record of which stage
|
||||||
stage the file has reached. The only move is the last one: into a terminal sink
|
the file has reached. The only move is the last one, into a terminal sink
|
||||||
(`data/done/`, `data/text_done/`, `data/binary/`) or into `data/failed/` if a
|
(`data/done/`, `data/text_done/`, `data/binary/`) or into `data/failed/` if a
|
||||||
worker throws. Stage 1 used to rename each file into `data/known/` or
|
worker throws. Stage 1 used to rename each file into `data/known/` or
|
||||||
`data/unknown/` first, and stage 3 into `data/text/`; those three directories are
|
`data/unknown/` first, and stage 3 into `data/text/`. Those three directories are
|
||||||
gone, and with them 11.6 µs per file — the equal of the classifier itself, which
|
gone, and with them 11.6 µs per file, the equal of the classifier itself. Stage 1
|
||||||
is why stage 1 now runs at ~85k files/s on one worker instead of ~35k.
|
now runs at ~85k files/s on one worker instead of ~35k.
|
||||||
|
|
||||||
Stages 2 (known-file enrichment) and 3 (content triage) run in parallel: stage 1
|
Stages 2 (known-file enrichment) and 3 (content triage) run in parallel: stage 1
|
||||||
feeds both the known and unknown queues. Stage 3 in turn feeds stage 4 (language
|
feeds both the known and unknown queues. Stage 3 in turn feeds stage 4 (language
|
||||||
@@ -83,10 +83,10 @@ Key properties:
|
|||||||
|
|
||||||
- **Fast intake:** the queue only ever carries small references; file bytes live
|
- **Fast intake:** the queue only ever carries small references; file bytes live
|
||||||
on disk, so memory stays flat regardless of file size. This holds end to end:
|
on disk, so memory stays flat regardless of file size. This holds end to end:
|
||||||
intake **streams** each upload from the socket to the spool file a chunk at a
|
intake streams each upload from the socket to the spool file a chunk at a
|
||||||
time (`FS_UPLOAD_CHUNK_BYTES`, default 64 KiB) rather than buffering the body,
|
time (`FS_UPLOAD_CHUNK_BYTES`, default 64 KiB) rather than buffering the body,
|
||||||
and every worker reads only a bounded prefix. Measured: uploads of 256 MiB,
|
and every worker reads only a bounded prefix. Measured: uploads of 256 MiB,
|
||||||
1 GiB and 2 GiB each grow resident memory by ~20 MiB — a flat line in file
|
1 GiB and 2 GiB each grow resident memory by ~20 MiB, a flat line in file
|
||||||
size. See "Streaming intake" and "Benchmarking" below.
|
size. See "Streaming intake" and "Benchmarking" below.
|
||||||
- **Backpressure:** each queue is bounded (default 1000). When the *intake* queue
|
- **Backpressure:** each queue is bounded (default 1000). When the *intake* queue
|
||||||
is full, uploads get `503 Service Unavailable`. When the *known* queue is full,
|
is full, uploads get `503 Service Unavailable`. When the *known* queue is full,
|
||||||
@@ -102,15 +102,15 @@ Key properties:
|
|||||||
it is abandoned.
|
it is abandoned.
|
||||||
|
|
||||||
The cost of replay is redoing stages a file had already cleared. That is a
|
The cost of replay is redoing stages a file had already cleared. That is a
|
||||||
property of the **queue**, not of the directory layout: the queues are
|
property of the *queue*, not of the directory layout: the queues are
|
||||||
in-process (`src/queue.jl`), so a crash destroys the only record of how far
|
in-process (`src/queue.jl`), so a crash destroys the only record of how far
|
||||||
each file got. Per-stage directories used to stand in for that record, at the
|
each file got. Per-stage directories used to stand in for that record, at the
|
||||||
price of a rename per file per stage on the hot path — paying a permanent cost
|
price of a rename per file per stage on the hot path: a permanent cost on
|
||||||
on every file to buy a cheaper restart. `src/queue.jl` already defines the seam
|
every file, to buy a cheaper restart. `src/queue.jl` already defines the seam
|
||||||
for the real fix: swap `ChannelQueue` for a broker-backed `JobQueue` and exact
|
for the real fix: swap `ChannelQueue` for a broker-backed `JobQueue` and exact
|
||||||
resume comes back durably, rather than being inferred from a pathname.
|
resume comes back durably, rather than being inferred from a pathname.
|
||||||
- **Graceful shutdown:** SIGINT (Ctrl-C) and SIGTERM (systemd/Docker/k8s `stop`)
|
- **Graceful shutdown:** SIGINT (Ctrl-C) and SIGTERM (systemd/Docker/k8s `stop`)
|
||||||
both stop accepting uploads, then drain the stages *in order* — close the
|
both stop accepting uploads, then drain the stages *in order*: close the
|
||||||
stage-1 queue and wait out the classify workers (the only producer of the known
|
stage-1 queue and wait out the classify workers (the only producer of the known
|
||||||
*and* unknown queues), then close those queues and wait out the enrich and
|
*and* unknown queues), then close those queues and wait out the enrich and
|
||||||
content-triage workers (content triage being the only producer of the text
|
content-triage workers (content triage being the only producer of the text
|
||||||
@@ -123,22 +123,22 @@ Key properties:
|
|||||||
|
|
||||||
The upload endpoint never holds a file in memory. Bytes go socket → spool file in
|
The upload endpoint never holds a file in memory. Bytes go socket → spool file in
|
||||||
`FS_UPLOAD_CHUNK_BYTES` chunks, so resident memory per in-flight upload is set by
|
`FS_UPLOAD_CHUNK_BYTES` chunks, so resident memory per in-flight upload is set by
|
||||||
the chunk size, not the file size — a 2 GiB upload costs about what a 2 KiB one
|
the chunk size, not the file size. A 2 GiB upload costs about what a 2 KiB one
|
||||||
does. Two pieces make that work, and both are deliberate:
|
does. Two pieces make that work, and both are deliberate:
|
||||||
|
|
||||||
- **`src/multipart.jl` — an incremental multipart parser.** HTTP.jl's
|
- **`src/multipart.jl`, an incremental multipart parser.** HTTP.jl's
|
||||||
`parse_multipart_form` takes the *complete* body as a byte vector, so using it
|
`parse_multipart_form` takes the *complete* body as a byte vector, so using it
|
||||||
means every file in the request is in memory at once (and copied again per
|
means every file in the request is in memory at once (and copied again per
|
||||||
part). The reader here pulls fixed-size chunks and hands each part's bytes
|
part). The reader here pulls fixed-size chunks and hands each part's bytes
|
||||||
straight to its spool file. Its interface is two calls in a loop —
|
straight to its spool file. Its interface is two calls in a loop
|
||||||
`next_part!` then `write_part_body!` (or `skip_part_body!`) — so the handler
|
(`next_part!` then `write_part_body!`, or `skip_part_body!`), so the handler
|
||||||
keeps ordinary control flow instead of inverting into callbacks. The subtle
|
keeps ordinary control flow instead of inverting into callbacks. The subtle
|
||||||
part is that a boundary delimiter can straddle two chunks, so the buffer always
|
part is that a boundary delimiter can straddle two chunks, so the buffer always
|
||||||
retains the last `length(delimiter)-1` bytes; the test suite parses the same
|
retains the last `length(delimiter)-1` bytes; the test suite parses the same
|
||||||
body at chunk sizes from 1 byte upward to put that split at every offset.
|
body at chunk sizes from 1 byte upward to put that split at every offset.
|
||||||
- **`/upload` bypasses Oxygen's router.** Oxygen's root handler wraps
|
- **`/upload` bypasses Oxygen's router.** Oxygen's root handler wraps
|
||||||
`HTTP.streamhandler`, which does `request.body = read(stream)` *before*
|
`HTTP.streamhandler`, which does `request.body = read(stream)` *before*
|
||||||
dispatching — even for an Oxygen `@stream` route, so no route can stream an
|
dispatching, even for an Oxygen `@stream` route, so no route can stream an
|
||||||
upload. `run` therefore passes its own `handler` to `serve`
|
upload. `run` therefore passes its own `handler` to `serve`
|
||||||
(`root_stream_handler`), which intercepts `POST /upload` at the stream level and
|
(`root_stream_handler`), which intercepts `POST /upload` at the stream level and
|
||||||
delegates everything else to Oxygen unchanged. The trade-off: `/upload` is
|
delegates everything else to Oxygen unchanged. The trade-off: `/upload` is
|
||||||
@@ -157,28 +157,28 @@ complete) and the event is logged `upload aborted by client`. One cosmetic cavea
|
|||||||
like the SIGTERM one below: when a request body is cut short, HTTP.jl's own
|
like the SIGTERM one below: when a request body is cut short, HTTP.jl's own
|
||||||
`closeread` logs an `EOFError` after the handler returns, because the connection
|
`closeread` logs an `EOFError` after the handler returns, because the connection
|
||||||
promised more bytes via `Content-Length` than arrived. It's harmless noise from
|
promised more bytes via `Content-Length` than arrived. It's harmless noise from
|
||||||
inside HTTP.jl — the partial file is already cleaned up and the connection closed.
|
inside HTTP.jl: the partial file is already cleaned up and the connection closed.
|
||||||
|
|
||||||
### Metadata enrichment (stage 2)
|
### Metadata enrichment (stage 2)
|
||||||
|
|
||||||
Files the classifier labels **known** are handed to a second pool that extracts
|
Files the classifier labels **known** are handed to a second pool that extracts
|
||||||
metadata with [`exiftool`](https://exiftool.org/) (`exiftool -json -G -n`) —
|
metadata with [`exiftool`](https://exiftool.org/) (`exiftool -json -G -n`),
|
||||||
chosen because no native Julia library comes close to its multi-format coverage.
|
chosen because no native Julia library comes close to its multi-format coverage.
|
||||||
The output is normalized into a small, stable, documented schema and written as a
|
The output is normalized into a small, stable, documented schema and written as a
|
||||||
JSON **sidecar** next to the file in `data/done/`, e.g.
|
JSON **sidecar** next to the file in `data/done/`, e.g.
|
||||||
`data/done/<uuid>-<name>.meta.json`. The original bytes are never modified.
|
`data/done/<uuid>-<name>.meta.json`. The original bytes are never modified.
|
||||||
|
|
||||||
> **Prerequisite:** `exiftool` must be on `PATH` (e.g. `apt install
|
> **Prerequisite:** `exiftool` must be on `PATH` (e.g. `apt install
|
||||||
> libimage-exiftool-perl`). The server **fails fast at startup** if it's missing.
|
> libimage-exiftool-perl`). The server fails fast at startup if it's missing.
|
||||||
|
|
||||||
Sidecar top-level fields (all nullable — present only when available), plus the
|
Sidecar top-level fields (all nullable, present only when available), plus the
|
||||||
complete raw `exiftool` object under `raw`:
|
complete raw `exiftool` object under `raw`:
|
||||||
|
|
||||||
| Field | Meaning |
|
| Field | Meaning |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `id`, `original_name` | job id and client-supplied name |
|
| `id`, `original_name` | job id and client-supplied name |
|
||||||
| `file_type`, `mime_type` | e.g. `PDF` / `application/pdf` |
|
| `file_type`, `mime_type` | e.g. `PDF` / `application/pdf` |
|
||||||
| `file_size` | bytes (authoritative, from intake — not exiftool) |
|
| `file_size` | bytes (authoritative, from intake, not exiftool) |
|
||||||
| `created_date`, `modified_date` | content timestamps |
|
| `created_date`, `modified_date` | content timestamps |
|
||||||
| `author` | person (`Author`/`Artist`/`By-line`) |
|
| `author` | person (`Author`/`Artist`/`By-line`) |
|
||||||
| `created_by` | authoring app/tool (`Producer`/`CreatorTool`/`Creator`/`Software`/…) |
|
| `created_by` | authoring app/tool (`Producer`/`CreatorTool`/`Creator`/`Software`/…) |
|
||||||
@@ -191,12 +191,12 @@ complete raw `exiftool` object under `raw`:
|
|||||||
Each normalized field is a coalesce over a priority list of exiftool tags
|
Each normalized field is a coalesce over a priority list of exiftool tags
|
||||||
(`src/metadata.jl`); extend a field by appending tag names. If extraction fails
|
(`src/metadata.jl`); extend a field by appending tag names. If extraction fails
|
||||||
or `exiftool` times out (`FS_EXIFTOOL_TIMEOUT`, default 30s), the file still
|
or `exiftool` times out (`FS_EXIFTOOL_TIMEOUT`, default 30s), the file still
|
||||||
completes to `data/done/` with a **degraded sidecar** — `file_size`/`file_type`
|
completes to `data/done/` with a **degraded sidecar** (`file_size`/`file_type`
|
||||||
plus an `error` note — rather than being quarantined, because it's still a wanted
|
plus an `error` note) rather than being quarantined, because it's still a wanted
|
||||||
known file. Only genuine I/O errors (can't write the sidecar or move the file)
|
known file. Only genuine I/O errors (can't write the sidecar or move the file)
|
||||||
send it to `data/failed/`.
|
send it to `data/failed/`.
|
||||||
|
|
||||||
The sidecar is committed **before** the file is moved into `data/done/`, so a
|
The sidecar is committed *before* the file is moved into `data/done/`, so a
|
||||||
file's presence there always implies its sidecar is already present; a crash in
|
file's presence there always implies its sidecar is already present; a crash in
|
||||||
between leaves only a harmless orphan sidecar, and recovery re-enriches
|
between leaves only a harmless orphan sidecar, and recovery re-enriches
|
||||||
idempotently.
|
idempotently.
|
||||||
@@ -206,26 +206,23 @@ idempotently.
|
|||||||
Files the classifier labels **unknown** are handed to a third pool that sorts
|
Files the classifier labels **unknown** are handed to a third pool that sorts
|
||||||
them into two coarse buckets so downstream tooling can treat them differently:
|
them into two coarse buckets so downstream tooling can treat them differently:
|
||||||
|
|
||||||
- **binary** — the file looks like binary data. This is the end of the live path,
|
- **binary:** the file looks like binary data. This is the end of the live path,
|
||||||
so the file is committed to `data/binary/` (which is also the corpus the
|
so the file is committed to `data/binary/`, which doubles as the corpus for the
|
||||||
offline stage-5 discovery sweep reads).
|
offline stage-5 discovery sweep below.
|
||||||
- **text** — the file looks like text. Stage 4 is still to come, so nothing
|
- **text:** the file looks like text. Stage 4 is still to come, so nothing
|
||||||
moves; the file stays in `data/spool/` and its reference goes onto the
|
moves; the file stays in `data/spool/` and its reference goes onto the
|
||||||
stage-4 queue, ending up in `data/text_done/` once enriched.
|
stage-4 queue, ending up in `data/text_done/` once enriched.
|
||||||
|
|
||||||
The test is a **UTF-8 sniff**: read the first 8000 bytes and call the file text
|
The test is a **UTF-8 sniff**: read the first 8000 bytes and call the file text
|
||||||
when that window is valid UTF-8 and holds no control bytes outside the text-safe
|
when that window is valid UTF-8 and holds no control bytes outside the text-safe
|
||||||
set (tab, newline, CR, and friends, plus ESC for ANSI-colored logs); otherwise
|
set (tab, newline, CR, and friends, plus ESC for ANSI-colored logs); otherwise
|
||||||
binary. It's cheap (no full read) and Unicode-aware — unlike the older NUL-byte
|
binary. It's cheap (no full read) and Unicode-aware. Where the older NUL-byte and
|
||||||
or printable-ASCII heuristics, it keeps non-ASCII text (accents, CJK, emoji) in
|
printable-ASCII heuristics misfiled non-ASCII text, this keeps accents, CJK and
|
||||||
the text bucket instead of misfiling it, while binary formats — which rarely
|
emoji in the text bucket, while binary formats, which rarely form valid UTF-8
|
||||||
form valid UTF-8 near their start — still read as binary. A NUL byte is valid UTF-8 but
|
near their start, still read as binary. A NUL byte is valid UTF-8 but not a text
|
||||||
not a text control byte, so it still reads as binary. A multi-byte character
|
control byte, so it too reads as binary. A multi-byte character split by the
|
||||||
split by the 8000-byte boundary is trimmed before the check so it isn't mistaken
|
8000-byte boundary is trimmed before the check so it isn't mistaken for malformed
|
||||||
for malformed bytes. An empty file is treated as text. Binary is terminal on the
|
bytes. An empty file is treated as text (`src/content.jl`).
|
||||||
live path and is committed to `data/binary/` (which the offline **stage-5
|
|
||||||
discovery** sweep reads as its corpus — see below); text is handed to stage 4
|
|
||||||
without moving (`src/content.jl`).
|
|
||||||
|
|
||||||
### Language enrichment (stage 4)
|
### Language enrichment (stage 4)
|
||||||
|
|
||||||
@@ -233,12 +230,12 @@ Files that stage 3 sorts as **text** are handed to a fourth pool that identifies
|
|||||||
their language and writes a `.meta.json` sidecar, mirroring the stage-2
|
their language and writes a `.meta.json` sidecar, mirroring the stage-2
|
||||||
known-file enrichment. Two detectors run per file:
|
known-file enrichment. Two detectors run per file:
|
||||||
|
|
||||||
- **natural language** — [`Languages.jl`](https://github.com/JuliaText/Languages.jl)'s
|
- **natural language:** [`Languages.jl`](https://github.com/JuliaText/Languages.jl)'s
|
||||||
`LanguageDetector` (a Julia port of the `whatlang` n-gram model) reads a bounded
|
`LanguageDetector` (a Julia port of the `whatlang` n-gram model) reads a bounded
|
||||||
prefix (up to `LANG_SAMPLE_BYTES`, 64 KiB) and reports the language's English
|
prefix (up to `LANG_SAMPLE_BYTES`, 64 KiB) and reports the language's English
|
||||||
name, ISO 639-3 code, and a confidence in `[0,1]`. Pure Julia, no subprocess.
|
name, ISO 639-3 code, and a confidence in `[0,1]`. Pure Julia, no subprocess.
|
||||||
The detector is built once at startup and shared read-only across the pool.
|
The detector is built once at startup and shared read-only across the pool.
|
||||||
- **programming language** — the [`github-linguist`](https://github.com/github-linguist/linguist)
|
- **programming language:** the [`github-linguist`](https://github.com/github-linguist/linguist)
|
||||||
CLI recognizes source and markup by extension + content heuristics (e.g.
|
CLI recognizes source and markup by extension + content heuristics (e.g.
|
||||||
`Python`, `Markdown`). Plain prose reports as `Text` and unrecognized content as
|
`Python`, `Markdown`). Plain prose reports as `Text` and unrecognized content as
|
||||||
`null`; both collapse to *no programming language*.
|
`null`; both collapse to *no programming language*.
|
||||||
@@ -257,42 +254,42 @@ The sidecar schema:
|
|||||||
| `error` | set if natural-language detection produced nothing |
|
| `error` | set if natural-language detection produced nothing |
|
||||||
|
|
||||||
> **`github-linguist` and the git-repo quirk:** run against a path *inside* a git
|
> **`github-linguist` and the git-repo quirk:** run against a path *inside* a git
|
||||||
> repository, linguist reads the file's committed git blob, not the on-disk bytes
|
> repository, linguist reads the file's committed git blob, not the on-disk
|
||||||
> — and an untracked file (which everything under `data/` is) has no blob, so it
|
> bytes, and an untracked file (which everything under `data/` is) has no blob,
|
||||||
> crashes. Stage 4 sidesteps this by copying each file to a fresh temp dir under
|
> so it crashes. Stage 4 sidesteps this by copying each file to a fresh temp dir under
|
||||||
> `/tmp` (outside any repo, preserving the name so extension heuristics still
|
> `/tmp` (outside any repo, preserving the name so extension heuristics still
|
||||||
> fire) and pointing linguist there.
|
> fire) and pointing linguist there.
|
||||||
>
|
>
|
||||||
> Programming-language detection is **best-effort**: if `github-linguist` is
|
> Programming-language detection is best-effort: if `github-linguist` is
|
||||||
> missing (a startup warning, not a fatal error, unlike `exiftool`), fails, or
|
> missing (a startup warning, not a fatal error, unlike `exiftool`), fails, or
|
||||||
> times out (`FS_LINGUIST_TIMEOUT`, default 30s), `programming_language` is simply
|
> times out (`FS_LINGUIST_TIMEOUT`, default 30s), `programming_language` is simply
|
||||||
> `null` and the file still completes. Natural-language detection failing produces
|
> `null` and the file still completes. Natural-language detection failing produces
|
||||||
> a **degraded sidecar** (with an `error` note) rather than a quarantine, because
|
> a **degraded sidecar** (with an `error` note) rather than a quarantine, because
|
||||||
> the file is still wanted text.
|
> the file is still wanted text.
|
||||||
|
|
||||||
Like stage 2, the sidecar is committed **before** the file is moved into
|
Like stage 2, the sidecar is committed *before* the file is moved into
|
||||||
`data/text_done/`, so the file's presence there always implies its sidecar is
|
`data/text_done/`, so the file's presence there always implies its sidecar is
|
||||||
present; recovery re-enriches idempotently (`src/language.jl`).
|
present; recovery re-enriches idempotently (`src/language.jl`).
|
||||||
|
|
||||||
### Unknown-format discovery (stage 5, offline)
|
### Unknown-format discovery (stage 5, offline)
|
||||||
|
|
||||||
The `binary/` sink from stage 3 is the pile of genuinely *unrecognized* files.
|
The `binary/` sink from stage 3 is the pile of genuinely *unrecognized* files.
|
||||||
Stage 5 mines it for **recurring new file formats** by clustering files on their
|
Stage 5 mines it for recurring new file formats by clustering files on their
|
||||||
header bytes — a growing catalog of discovered formats, each with a magic-byte
|
header bytes into a growing catalog of discovered formats, each with a magic-byte
|
||||||
signature that can eventually be promoted into the classifier's fast path. Unlike
|
signature that can eventually be promoted into the classifier's fast path. Unlike
|
||||||
stages 1–4 it is **not on the request hot path**: it is a single-owner *batch*
|
stages 1–4 it is not on the request hot path: it is a single-owner *batch*
|
||||||
process (the catalog is mutable shared state, the opposite of the stateless
|
process (the catalog is mutable shared state, the opposite of the stateless
|
||||||
classifier), and because promotion is human-gated nothing here is
|
classifier), and because promotion is human-gated nothing here is
|
||||||
latency-sensitive. The full rationale — and the assumptions we deliberately
|
latency-sensitive. The full rationale, and the assumptions we deliberately
|
||||||
rejected — live in [`model/DESIGN_clustering.md`](model/DESIGN_clustering.md).
|
rejected, live in [`model/DESIGN_clustering.md`](model/DESIGN_clustering.md).
|
||||||
|
|
||||||
The model (`src/cluster.jl`, base-Julia, no extra deps) is a Dirichlet-process
|
The model (`src/cluster.jl`, base-Julia, no extra deps) is a Dirichlet-process
|
||||||
mixture of **per-position categoricals** over the first 32 header bytes, on a
|
mixture of **per-position categoricals** over the first 32 header bytes, on a
|
||||||
257-symbol alphabet (byte `0–255` plus a `past-EOF` symbol so short fixed-length
|
257-symbol alphabet (byte `0–255` plus a `past-EOF` symbol so short fixed-length
|
||||||
formats are modeled honestly). Bytes are treated as **categorical, not numeric**
|
formats are modeled honestly). Bytes are treated as categorical rather than
|
||||||
— `0x89` and `0x88` are not "close" — so this deliberately does *not* reuse the
|
numeric (`0x89` and `0x88` are not "close"), so this deliberately does *not*
|
||||||
classifier's `[0,1]` byte scaling. A fixed uniform **background** component
|
reuse the classifier's `[0,1]` byte scaling. A fixed uniform *background*
|
||||||
absorbs structureless (compressed/encrypted) blobs so they don't mint spurious
|
component absorbs structureless (compressed/encrypted) blobs so they don't mint spurious
|
||||||
clusters. A cluster's spiked positions become a libmagic-style signature;
|
clusters. A cluster's spiked positions become a libmagic-style signature;
|
||||||
clusters with enough members and enough fixed positions self-**nominate** for
|
clusters with enough members and enough fixed positions self-**nominate** for
|
||||||
promotion (a human does the one irreversible step, redefining "known").
|
promotion (a human does the one irreversible step, redefining "known").
|
||||||
@@ -302,8 +299,8 @@ is the science; phase B (`src/catalog.jl`) is the live catalog: a durable
|
|||||||
single-owner state that sweeps `binary/`, folds each new file into a cluster with
|
single-owner state that sweeps `binary/`, folds each new file into a cluster with
|
||||||
the deterministic CRP-predictive rule, and writes promotion nominations.
|
the deterministic CRP-predictive rule, and writes promotion nominations.
|
||||||
|
|
||||||
The catalog process is run periodically (cron), single-threaded — it is the
|
The catalog process is run periodically (cron), single-threaded. It is the only
|
||||||
**only** writer of the catalog, so it needs no locking:
|
writer of the catalog, so it needs no locking:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
julia --project=. bin/cluster_sweep.jl # incremental live sweep of new binary/ files
|
julia --project=. bin/cluster_sweep.jl # incremental live sweep of new binary/ files
|
||||||
@@ -313,17 +310,17 @@ julia --project=. bin/cluster_sweep.jl --compact # offline Gibbs re-cluster (se
|
|||||||
The catalog is a single durable file (`FS_CLUSTER_CATALOG`, default
|
The catalog is a single durable file (`FS_CLUSTER_CATALOG`, default
|
||||||
`data/catalog.json`) committed with the same sidecar-first
|
`data/catalog.json`) committed with the same sidecar-first
|
||||||
temp→fsync→rename→fsync-dir discipline as the stage-2 sidecars, so a crash can
|
temp→fsync→rename→fsync-dir discipline as the stage-2 sidecars, so a crash can
|
||||||
neither corrupt it nor lose a write. On the **first** run (empty catalog) the
|
neither corrupt it nor lose a write. On the first run (empty catalog) the sweep
|
||||||
sweep auto-promotes to a `--compact` pass to seed clusters; later runs assign
|
auto-promotes to a `--compact` pass to seed clusters; later runs assign
|
||||||
incrementally, touching only files they have not seen. A cluster that clears the
|
incrementally, touching only files they have not seen. A cluster that clears the
|
||||||
member/magic thresholds writes a nomination — a hex magic template, member count,
|
member/magic thresholds writes a nomination (a hex magic template, member count,
|
||||||
and example filenames — into `FS_NOMINATED_DIR` (default `data/nominated/`) for a
|
and example filenames) into `FS_NOMINATED_DIR` (default `data/nominated/`) for a
|
||||||
human to glance at and promote. Under the calibrated `bg_mass > α`, the live
|
human to glance at and promote. Under the calibrated `bg_mass > α`, the live
|
||||||
sweep never mints single-file clusters; genuinely new formats surface from the
|
sweep never mints single-file clusters; genuinely new formats surface from the
|
||||||
periodic `--compact` re-clustering of the background residue, not the live path.
|
periodic `--compact` re-clustering of the background residue, not the live path.
|
||||||
|
|
||||||
Calibration is its own offline script (like training — never in the request
|
Calibration is its own offline script, like training, and never in the request
|
||||||
path), scored against magic-collapsed ground truth (so `docx`≡`zip` and the whole
|
path. It is scored against magic-collapsed ground truth (so `docx`≡`zip` and the whole
|
||||||
ELF family count as one format each, which is the *correct* answer, not an error):
|
ELF family count as one format each, which is the *correct* answer, not an error):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -336,15 +333,15 @@ training corpus the calibrated defaults (`n=32`, `α=1.0`, `β=0.1`) recover the
|
|||||||
known formats at **ARI 0.77** (0.885 excluding tar), with `gzip`, `pkzip`
|
known formats at **ARI 0.77** (0.885 excluding tar), with `gzip`, `pkzip`
|
||||||
(`docx`+`zip` merged), and `jpeg` forming clean, promotable clusters; the NCD
|
(`docx`+`zip` merged), and `jpeg` forming clean, promotable clusters; the NCD
|
||||||
baseline agrees. See `DESIGN_clustering.md` §11 for the full results, including the
|
baseline agrees. See `DESIGN_clustering.md` §11 for the full results, including the
|
||||||
one known limitation (ELF and these tarballs share a long run of header zero-
|
one known limitation: ELF and these tarballs share a long run of header
|
||||||
padding and merge — the v2 fix is inverse-entropy position weighting).
|
zero-padding and merge. The v2 fix is inverse-entropy position weighting.
|
||||||
|
|
||||||
## The queue seam (→ RabbitMQ later)
|
## The queue seam (→ RabbitMQ later)
|
||||||
|
|
||||||
The HTTP handler and workers only ever call `enqueue!`, `dequeue!`, and
|
The HTTP handler and workers only ever call `enqueue!`, `dequeue!`, and
|
||||||
`close!` on a `JobQueue` (see `src/queue.jl`). Today that's an in-process
|
`close!` on a `JobQueue` (see `src/queue.jl`). Today that's an in-process
|
||||||
`ChannelQueue`. To move to RabbitMQ (or any broker), implement a new `JobQueue`
|
`ChannelQueue`. To move to RabbitMQ (or any broker), implement a new `JobQueue`
|
||||||
subtype with those three methods and swap the construction in `run` — no handler
|
subtype with those three methods and swap the construction in `run`. No handler
|
||||||
or worker code changes.
|
or worker code changes.
|
||||||
|
|
||||||
## Running
|
## Running
|
||||||
@@ -354,7 +351,7 @@ or worker code changes.
|
|||||||
julia --project=. -e 'using Pkg; Pkg.instantiate()'
|
julia --project=. -e 'using Pkg; Pkg.instantiate()'
|
||||||
|
|
||||||
# external tools: exiftool (stage 2, required) and github-linguist (stage 4,
|
# external tools: exiftool (stage 2, required) and github-linguist (stage 4,
|
||||||
# optional — programming-language detection). e.g. on Debian/Ubuntu:
|
# optional, for programming-language detection). e.g. on Debian/Ubuntu:
|
||||||
# apt install libimage-exiftool-perl
|
# apt install libimage-exiftool-perl
|
||||||
# gem install github-linguist
|
# gem install github-linguist
|
||||||
|
|
||||||
@@ -369,12 +366,12 @@ Both SIGINT and SIGTERM trigger the same idempotent graceful drain
|
|||||||
|
|
||||||
- **SIGINT** is caught as an `InterruptException` (we call
|
- **SIGINT** is caught as an `InterruptException` (we call
|
||||||
`Base.exit_on_sigint(false)`), so shutdown is clean and quiet.
|
`Base.exit_on_sigint(false)`), so shutdown is clean and quiet.
|
||||||
- **SIGTERM** can't be intercepted directly — Julia blocks it on worker threads
|
- **SIGTERM** can't be intercepted directly: Julia blocks it on worker threads
|
||||||
and handles it in its own runtime, so a user `signal()` handler never fires.
|
and handles it in its own runtime, so a user `signal()` handler never fires.
|
||||||
Instead we hook the drain into an `atexit` handler, which Julia's SIGTERM path
|
Instead we hook the drain into an `atexit` handler, which Julia's SIGTERM path
|
||||||
does run. Caveat: Julia prints its own `signal 15: Terminated` backtrace
|
does run. Caveat: Julia prints its own `signal 15: Terminated` backtrace
|
||||||
*before* `atexit` runs. It's harmless noise — the drain still completes right
|
*before* `atexit` runs. It's harmless noise, and the drain still completes
|
||||||
after it — but if you want a fully quiet stop under a process manager,
|
right after it, but for a fully quiet stop under a process manager,
|
||||||
configure it to send SIGINT instead (systemd: `KillSignal=SIGINT`; Docker:
|
configure it to send SIGINT instead (systemd: `KillSignal=SIGINT`; Docker:
|
||||||
`STOPSIGNAL SIGINT`). Give the stop timeout enough headroom to drain
|
`STOPSIGNAL SIGINT`). Give the stop timeout enough headroom to drain
|
||||||
in-flight work (systemd: `TimeoutStopSec`).
|
in-flight work (systemd: `TimeoutStopSec`).
|
||||||
@@ -383,7 +380,7 @@ Both SIGINT and SIGTERM trigger the same idempotent graceful drain
|
|||||||
|
|
||||||
Each file is scored by a fixed-structure neural network (Lux.jl) that answers a
|
Each file is scored by a fixed-structure neural network (Lux.jl) that answers a
|
||||||
single binary question: is this file **known** (like the types in the training
|
single binary question: is this file **known** (like the types in the training
|
||||||
set) or **unknown**? It's novelty detection, not exact file-typing — it won't
|
set) or **unknown**? It's novelty detection, not exact file-typing: it won't
|
||||||
tell you "PDF", just "this looks like something I was trained on, or not".
|
tell you "PDF", just "this looks like something I was trained on, or not".
|
||||||
|
|
||||||
- **Features:** the first 16 bytes + last 16 bytes of the file, each scaled
|
- **Features:** the first 16 bytes + last 16 bytes of the file, each scaled
|
||||||
@@ -406,14 +403,14 @@ shared by the trainer and the server, so they can't drift apart.
|
|||||||
|
|
||||||
### Training
|
### Training
|
||||||
|
|
||||||
Training is a separate, offline script — it never runs in the request path:
|
Training is a separate, offline script. It never runs in the request path:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
julia --project=. bin/train.jl <positives_dir> [negatives_dir]
|
julia --project=. bin/train.jl <positives_dir> [negatives_dir]
|
||||||
```
|
```
|
||||||
|
|
||||||
- **positives_dir** — every file in it (≥32 bytes) is a "known" example.
|
- **positives_dir:** every file in it (≥32 bytes) is a "known" example.
|
||||||
- **negatives_dir** *(optional)* — a grab-bag of *other* real file types used as
|
- **negatives_dir** *(optional)*: a grab-bag of *other* real file types used as
|
||||||
"unknown" examples. Negatives are generated ~1:1 with positives, split 50/50
|
"unknown" examples. Negatives are generated ~1:1 with positives, split 50/50
|
||||||
between uniform-random byte vectors and grab-bag files. With no grab-bag dir,
|
between uniform-random byte vectors and grab-bag files. With no grab-bag dir,
|
||||||
negatives are all random (weaker: the net may just learn "high entropy =
|
negatives are all random (weaker: the net may just learn "high entropy =
|
||||||
@@ -489,8 +486,8 @@ Each file in a request becomes its own job. Responses:
|
|||||||
|
|
||||||
The pipeline counts its own work (`src/stats.jl`), because nothing outside it
|
The pipeline counts its own work (`src/stats.jl`), because nothing outside it
|
||||||
can. Every in-flight file sits in `data/spool/` no matter which stage it has
|
can. Every in-flight file sits in `data/spool/` no matter which stage it has
|
||||||
reached — the stage is a property of the queue holding its reference, and only
|
reached. The stage is a property of the queue holding its reference, and only
|
||||||
the pipeline can see that. There is no directory to poll.
|
the pipeline can see that; there is no directory to poll.
|
||||||
|
|
||||||
```jsonc
|
```jsonc
|
||||||
{
|
{
|
||||||
@@ -507,7 +504,7 @@ the pipeline can see that. There is no directory to poll.
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Counters are monotonic since startup, Prometheus-style — rates are the reader's
|
Counters are monotonic since startup, Prometheus-style. Rates are the reader's
|
||||||
job, so a scrape is stateless and two readers can't disturb each other. Take two
|
job, so a scrape is stateless and two readers can't disturb each other. Take two
|
||||||
scrapes Δt apart and subtract:
|
scrapes Δt apart and subtract:
|
||||||
|
|
||||||
@@ -523,14 +520,14 @@ each pool worked to keep up. The bottleneck sits near 1.0 with its queue backing
|
|||||||
up while its neighbours idle.
|
up while its neighbours idle.
|
||||||
|
|
||||||
`blocked_seconds` is what keeps that true. Stages 1 and 3 apply *blocking*
|
`blocked_seconds` is what keeps that true. Stages 1 and 3 apply *blocking*
|
||||||
backpressure — a full downstream queue means the handler parks and retries rather
|
backpressure (a full downstream queue means the handler parks and retries rather
|
||||||
than dropping the file — and that wait happens inside the handler. Counting it as
|
than dropping the file), and that wait happens inside the handler. Counting it as
|
||||||
busy would pin stage 1 at 1.0 whenever stage 2 is the real jam, making every
|
busy would pin stage 1 at 1.0 whenever stage 2 is the real jam, making every
|
||||||
stage upstream of a jam look like the jam. Subtracted out, utilization means
|
stage upstream of a jam look like the jam. Subtracted out, utilization means
|
||||||
"doing its own work", and a high blocked share becomes its own signal: a stage
|
"doing its own work", and a high blocked share becomes its own signal: a stage
|
||||||
blocked 90% of the time is naming its successor.
|
blocked 90% of the time is naming its successor.
|
||||||
|
|
||||||
The counters are a handful of atomic adds per file, recorded in `worker_loop` —
|
The counters are a handful of atomic adds per file, recorded in `worker_loop`:
|
||||||
the one place every stage's work passes through, so a new stage is instrumented
|
the one place every stage's work passes through, so a new stage is instrumented
|
||||||
the moment it is wired up, and never on the read path.
|
the moment it is wired up, and never on the read path.
|
||||||
|
|
||||||
@@ -551,13 +548,13 @@ Running all of them from a clean checkout:
|
|||||||
```bash
|
```bash
|
||||||
julia --project=. -e 'using Pkg; Pkg.instantiate()' # once
|
julia --project=. -e 'using Pkg; Pkg.instantiate()' # once
|
||||||
|
|
||||||
# 1. the model, on its own — no server involved
|
# 1. the model, on its own; no server involved
|
||||||
julia --project=. -t auto bin/bench_model.jl
|
julia --project=. -t auto bin/bench_model.jl
|
||||||
|
|
||||||
# 1b. stage 1 taken apart — also no server
|
# 1b. stage 1 taken apart; also no server
|
||||||
julia --project=. -t auto bin/bench_stage1.jl
|
julia --project=. -t auto bin/bench_stage1.jl
|
||||||
|
|
||||||
# 1c. stage 2 taken apart — needs a directory of real files, not generated ones
|
# 1c. stage 2 taken apart; needs a directory of real files, not generated ones
|
||||||
julia --project=. -t auto bin/bench_stage2.jl
|
julia --project=. -t auto bin/bench_stage2.jl
|
||||||
|
|
||||||
# 2. the pipeline. Start the server in one terminal…
|
# 2. the pipeline. Start the server in one terminal…
|
||||||
@@ -576,18 +573,18 @@ julia --project=. bin/cluster_calibrate.jl ../training_set
|
|||||||
The test suite is `julia --project=. -t auto -e 'using Pkg; Pkg.test()'`.
|
The test suite is `julia --project=. -t auto -e 'using Pkg; Pkg.test()'`.
|
||||||
|
|
||||||
`bin/bench.jl` must run on the same machine as the server (it reads the sink dirs
|
`bin/bench.jl` must run on the same machine as the server (it reads the sink dirs
|
||||||
and `/proc`); otherwise it only speaks HTTP — `/upload`, `/health`, and `/stats`
|
and `/proc`); otherwise it only speaks HTTP: `/upload`, `/health`, and `/stats`
|
||||||
for the per-stage numbers.
|
for the per-stage numbers.
|
||||||
|
|
||||||
Three properties of this design dictate how it measures:
|
Three properties of this design dictate how it measures:
|
||||||
|
|
||||||
- **HTTP latency is not throughput.** `/upload` returns `202` once the bytes are
|
- **HTTP latency is not throughput.** `/upload` returns `202` once the bytes are
|
||||||
spooled and a reference is enqueued — all four stages run *after* the response,
|
spooled and a reference is enqueued, and all four stages run *after* the
|
||||||
so `ab`/`hey`/`wrk` would only ever measure intake. The bench instead uploads a
|
response, so `ab`/`hey`/`wrk` would only ever measure intake. The bench
|
||||||
corpus and polls the terminal sinks (`done/`, `text_done/`, `binary/`,
|
instead uploads a corpus and polls the terminal sinks (`done/`, `text_done/`, `binary/`,
|
||||||
`failed/`) until the count stops moving, and reports both numbers separately:
|
`failed/`) until the count stops moving, and reports both numbers separately:
|
||||||
intake rate *and* end-to-end completion rate. It also samples `spool/`, whose
|
intake rate *and* end-to-end completion rate. It also samples `spool/`, whose
|
||||||
peak depth is the high-water mark of files in flight — but *which* stage they
|
peak depth is the high-water mark of files in flight. But *which* stage they
|
||||||
are waiting on comes from `/stats`, not from disk.
|
are waiting on comes from `/stats`, not from disk.
|
||||||
- **End-to-end throughput doesn't name the slow stage.** The four stages run
|
- **End-to-end throughput doesn't name the slow stage.** The four stages run
|
||||||
concurrently behind their own queues, so the pipeline's rate *is* the slowest
|
concurrently behind their own queues, so the pipeline's rate *is* the slowest
|
||||||
@@ -606,8 +603,8 @@ Three properties of this design dictate how it measures:
|
|||||||
bottleneck stage 4 (language) at 87.0% utilization of 16 worker(s)
|
bottleneck stage 4 (language) at 87.0% utilization of 16 worker(s)
|
||||||
```
|
```
|
||||||
|
|
||||||
(400 mixed files, 16 KiB each, concurrency 16. Stage 4 is the constraint —
|
(400 mixed files, 16 KiB each, concurrency 16. Stage 4 is the constraint,
|
||||||
`github-linguist` is a process spawn per file at ~850 ms — and the 200 text
|
`github-linguist` being a process spawn per file at ~850 ms, and the 200 text
|
||||||
files queue up behind it while stages 1 and 3 idle at under 10%.) Read *down*
|
files queue up behind it while stages 1 and 3 idle at under 10%.) Read *down*
|
||||||
the util column, not the files/s column: each stage sees a different subset of
|
the util column, not the files/s column: each stage sees a different subset of
|
||||||
the corpus, so a low rate can just mean little work was routed there.
|
the corpus, so a low rate can just mean little work was routed there.
|
||||||
@@ -625,9 +622,9 @@ Three properties of this design dictate how it measures:
|
|||||||
| 256 MiB × 4 | 4 | none measurable (peak stayed under the baseline) |
|
| 256 MiB × 4 | 4 | none measurable (peak stayed under the baseline) |
|
||||||
|
|
||||||
**Read the shape, not the digits.** Growth is flat across an 8× range of file
|
**Read the shape, not the digits.** Growth is flat across an 8× range of file
|
||||||
sizes — 14–31 MiB whether the upload is 256 MiB or 2 GiB — which is the claim
|
sizes: 14–31 MiB whether the upload is 256 MiB or 2 GiB. That is the claim
|
||||||
that matters: nothing scales with file size, so nothing is buffering. The
|
that matters, because nothing scales with file size, so nothing is buffering.
|
||||||
absolute figures are *not* precise to the megabyte. A freshly started server
|
The absolute figures are *not* precise to the megabyte. A freshly started server
|
||||||
settles anywhere in an ~860–985 MiB band, so run-to-run variance in the
|
settles anywhere in an ~860–985 MiB band, so run-to-run variance in the
|
||||||
baseline is comparable to the growth being measured; the residual is GC churn
|
baseline is comparable to the growth being measured; the residual is GC churn
|
||||||
from the chunk reads, not retained buffers.
|
from the chunk reads, not retained buffers.
|
||||||
@@ -639,20 +636,20 @@ Three properties of this design dictate how it measures:
|
|||||||
(or none at all, as the concurrency-4 row above did).
|
(or none at all, as the concurrency-4 row above did).
|
||||||
- **Linear-in-concurrency is not currently demonstrated.** An earlier
|
- **Linear-in-concurrency is not currently demonstrated.** An earlier
|
||||||
measurement put 4 concurrent 256 MiB uploads at 86.9 MiB (21.7 per in-flight
|
measurement put 4 concurrent 256 MiB uploads at 86.9 MiB (21.7 per in-flight
|
||||||
upload), but that run predates a fix to how the baseline was sampled — it was
|
upload), but that run predates a fix to how the baseline was sampled: it was
|
||||||
read *before* the peak counter was reset, against a different origin — and the
|
read *before* the peak counter was reset, against a different origin. The
|
||||||
re-measurement above cannot reproduce it: the growth sits under the noise
|
re-measurement above cannot reproduce it, and the growth sits under the noise
|
||||||
floor. Expect concurrency to cost memory; don't trust a specific coefficient
|
floor. Expect concurrency to cost memory; don't trust a specific coefficient
|
||||||
without a quieter machine or many more runs.
|
without a quieter machine or many more runs.
|
||||||
|
|
||||||
Before intake
|
Before intake was streamed, the same 256 MiB upload grew RSS by ~700 MiB and 4
|
||||||
was streamed, the same 256 MiB upload grew RSS by ~700 MiB and 4 concurrent ones
|
concurrent ones pushed a 950 MiB baseline past 2 GiB. So a `--size` sweep that
|
||||||
pushed a 950 MiB baseline past 2 GiB, so **a `--size` sweep that slopes upward is
|
slopes upward is the regression signal: something has started buffering bodies
|
||||||
the regression signal** — it means something has started buffering bodies again.
|
again.
|
||||||
|
|
||||||
Flags: `--files`, `--size` (`8k`/`64m`/`1g`), `--concurrency`, `--kind`
|
Flags: `--files`, `--size` (`8k`/`64m`/`1g`), `--concurrency`, `--kind`
|
||||||
(`binary`/`text`/`mixed` — chooses which stages get loaded), `--corpus DIR` (real
|
(`binary`/`text`/`mixed`, which chooses the stages that get loaded), `--corpus
|
||||||
files, the only way to exercise stage 2's exiftool path), `--pid`, `--no-mem`,
|
DIR` (real files, the only way to exercise stage 2's exiftool path), `--pid`, `--no-mem`,
|
||||||
`--no-stats`, `--sample-ms`, `--timeout`, `--json PATH`. Full list in the script
|
`--no-stats`, `--sample-ms`, `--timeout`, `--json PATH`. Full list in the script
|
||||||
header. The `--json` output carries the per-stage numbers too, so a sweep can be
|
header. The `--json` output carries the per-stage numbers too, so a sweep can be
|
||||||
compared run to run.
|
compared run to run.
|
||||||
@@ -660,7 +657,7 @@ compared run to run.
|
|||||||
Two caveats the script reports rather than hides: it counts sink *deltas*, so it
|
Two caveats the script reports rather than hides: it counts sink *deltas*, so it
|
||||||
warns if the pipeline isn't idle at the start (in-flight leftovers would be
|
warns if the pipeline isn't idle at the start (in-flight leftovers would be
|
||||||
counted as its own throughput); and because Julia's GC returns memory to the OS
|
counted as its own throughput); and because Julia's GC returns memory to the OS
|
||||||
lazily, a second run in the same process starts from an inflated baseline — it
|
lazily, a second run in the same process starts from an inflated baseline. It
|
||||||
resets the kernel's peak-RSS counter (`/proc/<pid>/clear_refs`) per run and flags
|
resets the kernel's peak-RSS counter (`/proc/<pid>/clear_refs`) per run and flags
|
||||||
a drifted baseline, but for a clean growth figure restart the server between
|
a drifted baseline, but for a clean growth figure restart the server between
|
||||||
memory runs.
|
memory runs.
|
||||||
@@ -668,7 +665,7 @@ memory runs.
|
|||||||
### Stage-1 component benchmark (`bin/bench_stage1.jl`)
|
### Stage-1 component benchmark (`bin/bench_stage1.jl`)
|
||||||
|
|
||||||
`bin/bench.jl` reports stage 1 as one number and `bin/bench_model.jl` takes the
|
`bin/bench.jl` reports stage 1 as one number and `bin/bench_model.jl` takes the
|
||||||
*classifier* apart — but stage 1 is more than the model. Per file it also
|
*classifier* apart, but stage 1 is more than the model. Per file it also
|
||||||
renames the file into its stage directory, pushes a reference onto the
|
renames the file into its stage directory, pushes a reference onto the
|
||||||
downstream queue, and logs. `bin/bench_stage1.jl` times each of those in
|
downstream queue, and logs. `bin/bench_stage1.jl` times each of those in
|
||||||
isolation, then times the real `handle_classify_job` end to end so the parts can
|
isolation, then times the real `handle_classify_job` end to end so the parts can
|
||||||
@@ -692,33 +689,32 @@ Measured on this machine (Ryzen 7 2700X, 8 cores/16 threads, Julia 1.12; 2000 ×
|
|||||||
| **`handle_classify_job`** | **28.3 µs** | 100% |
|
| **`handle_classify_job`** | **28.3 µs** | 100% |
|
||||||
|
|
||||||
**This benchmark is why stage 1's per-file log lines are `@debug` rather than
|
**This benchmark is why stage 1's per-file log lines are `@debug` rather than
|
||||||
`@info`.** As `@info` they cost ~71 µs of the handler's ~118 µs — about 6× the
|
`@info`.** As `@info` they cost ~71 µs of the handler's ~118 µs, about 6× the
|
||||||
classifier and 6× the rename — and nearly all of it was `ConsoleLogger`
|
classifier and 6× the rename, and nearly all of it was `ConsoleLogger`
|
||||||
*formatting* (~64 µs), not the `FlushLogger`'s per-message flush (~8 µs on top).
|
*formatting* (~64 µs), not the `FlushLogger`'s per-message flush (~8 µs on top).
|
||||||
Demoting them took stage 1 from 8.5k files/s to 35.3k files/s on a single worker,
|
Demoting them took stage 1 from 8.5k files/s to 35.3k files/s on a single worker,
|
||||||
a 4.2× speedup for no algorithmic change. The script still prices a formatted
|
a 4.2× speedup for no algorithmic change. The script still prices a formatted
|
||||||
line, so the cost of turning them back on is visible: running the handler under
|
line, so the cost of turning them back on is visible: running the handler under
|
||||||
`JULIA_DEBUG=FileServer` measures 133 µs per file, a 4.7× slowdown. That is the
|
`JULIA_DEBUG=FileServer` measures 133 µs per file, a 4.7× slowdown. That is the
|
||||||
trade — per-file tracing is available when you want it, and off by default,
|
trade. Per-file tracing is available when you want it and off by default, with
|
||||||
with `GET /stats` giving per-file observability that is counted rather than
|
`GET /stats` giving per-file observability that is counted, not formatted.
|
||||||
formatted.
|
|
||||||
|
|
||||||
What's left is evenly split between the rename and the classifier, and neither
|
What's left is evenly split between the rename and the classifier, and neither
|
||||||
has an easy 2×. Two things worth knowing:
|
has an easy 2×. Two things worth knowing:
|
||||||
|
|
||||||
- **The rename, not the model, is the single largest component** (11.7 µs), and
|
- **The rename, not the model, is the single largest component** (11.7 µs), and
|
||||||
it's a plain `mv` within one filesystem. Inside `classify`, the same pattern
|
it's a plain `mv` within one filesystem. Inside `classify`, the same pattern
|
||||||
holds: 7.9 µs of the 10.7 µs is `read_features` — the `open`, the two reads
|
holds: 7.9 µs of the 10.7 µs is `read_features` (the `open`, the two reads
|
||||||
and the `seek` — against 2.3 µs of actual inference. Stage 1 is now a
|
and the `seek`) against 2.3 µs of actual inference. Stage 1 is now a
|
||||||
filesystem-bound stage with a neural network attached, not the reverse.
|
filesystem-bound stage with a neural network attached, not the reverse.
|
||||||
- **Stage 1 now peaks at ~4 workers.** With the logger removed from the hot path
|
- **Stage 1 now peaks at ~4 workers.** With the logger removed from the hot path
|
||||||
the sweep reads 35.0k/s at 1 worker, 66.6k/s at 2, **73.3k/s at 4**, then
|
the sweep reads 35.0k/s at 1 worker, 66.6k/s at 2, **73.3k/s at 4**, then
|
||||||
*falls back* to 60.1k/s at 8 and 53.3k/s at 16 — every worker renaming into the
|
*falls back* to 60.1k/s at 8 and 53.3k/s at 16, because every worker renaming
|
||||||
same two directories contends on the same directory inode. That ceiling
|
into the same two directories contends on the same directory inode. That ceiling
|
||||||
coincides with the one `bin/bench_model.jl` finds for inference, so ~4 is the
|
coincides with the one `bin/bench_model.jl` finds for inference, so ~4 is the
|
||||||
number from both directions: raising `FS_WORKERS` past it costs throughput.
|
number from both directions: raising `FS_WORKERS` past it costs throughput.
|
||||||
|
|
||||||
Reported times are the **minimum** over trials. Flags: `--files`, `--reps`,
|
Reported times are the minimum over trials. Flags: `--files`, `--reps`,
|
||||||
`--trials`, `--size`, `--dir`, `--model`, `--threads`, `--no-threads`,
|
`--trials`, `--size`, `--dir`, `--model`, `--threads`, `--no-threads`,
|
||||||
`--json PATH`.
|
`--json PATH`.
|
||||||
|
|
||||||
@@ -727,7 +723,7 @@ Reported times are the **minimum** over trials. Flags: `--files`, `--reps`,
|
|||||||
Stage 2 is the one stage whose cost is dominated by something outside Julia
|
Stage 2 is the one stage whose cost is dominated by something outside Julia
|
||||||
entirely: it forks `exiftool`, a Perl program, once per file. `bin/bench.jl`
|
entirely: it forks `exiftool`, a Perl program, once per file. `bin/bench.jl`
|
||||||
reports the stage as a single throughput number, which can't distinguish "the
|
reports the stage as a single throughput number, which can't distinguish "the
|
||||||
extraction is slow" from "the *spawn* is slow" — and those have opposite fixes.
|
extraction is slow" from "the *spawn* is slow", and those have opposite fixes.
|
||||||
`bin/bench_stage2.jl` times each piece in isolation, then times the real
|
`bin/bench_stage2.jl` times each piece in isolation, then times the real
|
||||||
`handle_known_job` end to end:
|
`handle_known_job` end to end:
|
||||||
|
|
||||||
@@ -739,14 +735,14 @@ Two things make this benchmark different from the stage-1 one:
|
|||||||
|
|
||||||
- **The corpus must be real files.** exiftool's cost depends on what it finds; a
|
- **The corpus must be real files.** exiftool's cost depends on what it finds; a
|
||||||
file of random bytes bails out early and understates the stage by ~10×. The
|
file of random bytes bails out early and understates the stage by ~10×. The
|
||||||
default corpus is `data/done` — files that already went through stage 2 on this
|
default corpus is `data/done`, files that already went through stage 2 on this
|
||||||
machine. `--corpus PATH` points it elsewhere.
|
machine. `--corpus PATH` points it elsewhere.
|
||||||
- **It prices the alternatives to one-fork-per-file**, because if the fork
|
- **It prices the alternatives to one-fork-per-file**, because if the fork
|
||||||
dominates then the only fixes are to stop paying it per file. `exiftool
|
dominates then the only fixes are to stop paying it per file. `exiftool
|
||||||
(batched Nx)` runs the whole corpus through one process; `exiftool
|
(batched Nx)` runs the whole corpus through one process; `exiftool
|
||||||
(-stay_open)` keeps one process alive and feeds it one file at a time over a
|
(-stay_open)` keeps one process alive and feeds it one file at a time over a
|
||||||
pipe — the shape a streaming pipeline could actually adopt. Both are measured,
|
pipe, which is the shape a streaming pipeline could actually adopt. Both are
|
||||||
not assumed.
|
measured, not assumed.
|
||||||
|
|
||||||
Measured on this machine (Ryzen 7 2700X, 8 cores/16 threads, Julia 1.12,
|
Measured on this machine (Ryzen 7 2700X, 8 cores/16 threads, Julia 1.12,
|
||||||
exiftool 12.40; 150 real files / 102 MiB, minimum of 2 trials):
|
exiftool 12.40; 150 real files / 102 MiB, minimum of 2 trials):
|
||||||
@@ -763,8 +759,8 @@ exiftool 12.40; 150 real files / 102 MiB, minimum of 2 trials):
|
|||||||
| *alt:* `exiftool -stay_open` | 40.1 ms | 29% |
|
| *alt:* `exiftool -stay_open` | 40.1 ms | 29% |
|
||||||
| *alt:* `exiftool` batched 150× | 37.3 ms | 27% |
|
| *alt:* `exiftool` batched 150× | 37.3 ms | 27% |
|
||||||
|
|
||||||
**Stage 2 is exiftool and nothing else.** Everything the Julia code does —
|
**Stage 2 is exiftool and nothing else.** Everything the Julia code does
|
||||||
parsing, normalizing, the durable sidecar-first commit, the log line — sums to
|
(parsing, normalizing, the durable sidecar-first commit, the log line) sums to
|
||||||
about 1.5% of the stage. There is no point optimizing any of it.
|
about 1.5% of the stage. There is no point optimizing any of it.
|
||||||
|
|
||||||
**More than half the stage is interpreter startup, not metadata extraction.**
|
**More than half the stage is interpreter startup, not metadata extraction.**
|
||||||
@@ -777,7 +773,7 @@ available win in this stage; it is measured here but not yet implemented.
|
|||||||
|
|
||||||
**This benchmark is also why `run_with_timeout` no longer polls.** The original
|
**This benchmark is also why `run_with_timeout` no longer polls.** The original
|
||||||
watchdog polled with `sleep(0.1)` and then joined the polling task, so every call
|
watchdog polled with `sleep(0.1)` and then joined the polling task, so every call
|
||||||
paid the remainder of an in-flight sleep *after* the child had already exited —
|
paid the remainder of an in-flight sleep *after* the child had already exited:
|
||||||
~25 ms per file here, and a measured 101 ms on a process that exits instantly.
|
~25 ms per file here, and a measured 101 ms on a process that exits instantly.
|
||||||
Replacing it with a one-shot `Timer` took the stage from 164.6 ms to 138.3 ms per
|
Replacing it with a one-shot `Timer` took the stage from 164.6 ms to 138.3 ms per
|
||||||
file (6→8 files/s on one worker) and cost nothing in behavior. Stage 4 shares the
|
file (6→8 files/s on one worker) and cost nothing in behavior. Stage 4 shares the
|
||||||
@@ -785,7 +781,7 @@ wrapper and got the same fix for free.
|
|||||||
|
|
||||||
Writing the missing tests for that wrapper turned up a second, worse problem:
|
Writing the missing tests for that wrapper turned up a second, worse problem:
|
||||||
**the timeout was never enforceable.** `wait(proc)` returns only once the
|
**the timeout was never enforceable.** `wait(proc)` returns only once the
|
||||||
captured stdout pipe closes, and any grandchild inherits that pipe — so
|
captured stdout pipe closes, and any grandchild inherits that pipe, so
|
||||||
signalling the child alone left the worker blocked until the whole process tree
|
signalling the child alone left the worker blocked until the whole process tree
|
||||||
finished on its own (a `sh -c "trap '' TERM; sleep 30"` child ran the full 30 s
|
finished on its own (a `sh -c "trap '' TERM; sleep 30"` child ran the full 30 s
|
||||||
against a 1 s timeout, under both the old and new watchdog). The child now runs
|
against a 1 s timeout, under both the old and new watchdog). The child now runs
|
||||||
@@ -795,7 +791,7 @@ these children are short-lived and timeout-bounded, which is the cheaper side of
|
|||||||
it.
|
it.
|
||||||
|
|
||||||
**Stage 2 scales to ~8 workers, then flattens**: 8 files/s at 1 worker, 14 at 2,
|
**Stage 2 scales to ~8 workers, then flattens**: 8 files/s at 1 worker, 14 at 2,
|
||||||
28 at 4, **49 at 8**, and 49 at 16 — the machine runs out of cores to run Perl
|
28 at 4, **49 at 8**, and 49 at 16. The machine runs out of cores to run Perl
|
||||||
on, which is exactly what you'd expect of a stage that is ~100% subprocess. Note
|
on, which is exactly what you'd expect of a stage that is ~100% subprocess. Note
|
||||||
that the sweep pulls from a shared counter rather than splitting the corpus into
|
that the sweep pulls from a shared counter rather than splitting the corpus into
|
||||||
contiguous slices: per-file exiftool time spans two orders of magnitude on a real
|
contiguous slices: per-file exiftool time spans two orders of magnitude on a real
|
||||||
@@ -808,13 +804,13 @@ which is far too fast to be a real disk flush. The durability that
|
|||||||
even though the code is correct. That's a correctness question, not a speed one,
|
even though the code is correct. That's a correctness question, not a speed one,
|
||||||
and it is not yet resolved.
|
and it is not yet resolved.
|
||||||
|
|
||||||
Reported times are the **minimum** over trials. Flags: `--files`, `--reps`,
|
Reported times are the minimum over trials. Flags: `--files`, `--reps`,
|
||||||
`--trials`, `--corpus`, `--dir`, `--timeout`, `--threads`, `--no-threads`,
|
`--trials`, `--corpus`, `--dir`, `--timeout`, `--threads`, `--no-threads`,
|
||||||
`--no-stay-open`, `--json PATH`.
|
`--no-stay-open`, `--json PATH`.
|
||||||
|
|
||||||
### Model microbenchmark (`bin/bench_model.jl`)
|
### Model microbenchmark (`bin/bench_model.jl`)
|
||||||
|
|
||||||
`bin/bench.jl` reports stage 1 as a single number — the wall time of
|
`bin/bench.jl` reports stage 1 as a single number: the wall time of
|
||||||
`handle_classify_job`, which is a feature read, an inference, a rename, a
|
`handle_classify_job`, which is a feature read, an inference, a rename, a
|
||||||
(disabled) debug line, and whatever contention the other three pools create.
|
(disabled) debug line, and whatever contention the other three pools create.
|
||||||
That's the right number for capacity planning and the wrong one for "is the
|
That's the right number for capacity planning and the wrong one for "is the
|
||||||
@@ -834,10 +830,10 @@ Measured on this machine (Ryzen 7 2700X, 8 cores/16 threads, Julia 1.12):
|
|||||||
| `read_features` | **4.2–6.0 µs** | flat across a 262,144× size range (1 KiB → 256 MiB) |
|
| `read_features` | **4.2–6.0 µs** | flat across a 262,144× size range (1 KiB → 256 MiB) |
|
||||||
| `classify()` | **8.4 µs** | 73% feature read, 27% inference |
|
| `classify()` | **8.4 µs** | 73% feature read, 27% inference |
|
||||||
|
|
||||||
So the model is **not** the pipeline's problem, by three orders of magnitude: the
|
So the model is not the pipeline's problem, by three orders of magnitude: the
|
||||||
same run measured stage 1 at 38.7 ms per file, ~4,500× the 8.4 µs `classify()`
|
same run measured stage 1 at 38.7 ms per file, ~4,500× the 8.4 µs `classify()`
|
||||||
costs. Whatever stage 1 spends its time on, it isn't the network. (That 38.7 ms
|
costs. Whatever stage 1 spends its time on, it isn't the network. (That 38.7 ms
|
||||||
predates the `@debug` demotion above and is a whole-pipeline figure — it includes
|
predates the `@debug` demotion above and is a whole-pipeline figure. It includes
|
||||||
time the stage-1 worker spends *blocked* on a full downstream queue, which is why
|
time the stage-1 worker spends *blocked* on a full downstream queue, which is why
|
||||||
it is three orders of magnitude above the 28.3 µs the handler costs in
|
it is three orders of magnitude above the 28.3 µs the handler costs in
|
||||||
isolation. For the uncontended split, see
|
isolation. For the uncontended split, see
|
||||||
@@ -855,13 +851,13 @@ Two findings worth acting on if stage 1 ever *does* become the constraint:
|
|||||||
control kernel through the same sweep to place the blame: the control reaches
|
control kernel through the same sweep to place the blame: the control reaches
|
||||||
14.3× at 16 tasks (90% efficiency) on the same box, so the machine
|
14.3× at 16 tasks (90% efficiency) on the same box, so the machine
|
||||||
parallelizes and `Lux.apply` doesn't. GC is only ~1% of it, so allocation
|
parallelizes and `Lux.apply` doesn't. GC is only ~1% of it, so allocation
|
||||||
pressure isn't the explanation either — the cause is inside Lux/BLAS and is
|
pressure isn't the explanation either. The cause is inside Lux/BLAS and is
|
||||||
not diagnosed here. The practical consequence: raising `FS_WORKERS` past ~4
|
not diagnosed here. The practical consequence: raising `FS_WORKERS` past ~4
|
||||||
adds no classification throughput.
|
adds no classification throughput.
|
||||||
|
|
||||||
Reported times are the **minimum** over trials — for a microbenchmark the floor
|
Reported times are the minimum over trials, because for a microbenchmark the
|
||||||
is the signal and everything above it is scheduler and GC noise — and every timed
|
floor is the signal and everything above it is scheduler and GC noise. Every
|
||||||
loop stores its result in a sink so a pure call can't be hoisted out of the loop.
|
timed loop stores its result in a sink so a pure call can't be hoisted out.
|
||||||
Flags: `--model`, `--reps`, `--trials`, `--batches`, `--sizes`, `--no-threads`,
|
Flags: `--model`, `--reps`, `--trials`, `--batches`, `--sizes`, `--no-threads`,
|
||||||
`--json PATH`.
|
`--json PATH`.
|
||||||
|
|
||||||
|
|||||||
42
bin/bench.jl
42
bin/bench.jl
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env julia
|
#!/usr/bin/env julia
|
||||||
#
|
#
|
||||||
# bench.jl — measure end-to-end throughput and server memory for a running FileServer.
|
# bench.jl: measure end-to-end throughput and server memory for a running FileServer.
|
||||||
#
|
#
|
||||||
# Two things make this pipeline awkward to benchmark with off-the-shelf tools
|
# Two things make this pipeline awkward to benchmark with off-the-shelf tools
|
||||||
# (ab/hey/wrk), and both shape what this script does:
|
# (ab/hey/wrk), and both shape what this script does:
|
||||||
#
|
#
|
||||||
# 1. HTTP latency is not throughput. /upload returns 202 as soon as the bytes
|
# 1. HTTP latency is not throughput. /upload returns 202 as soon as the bytes
|
||||||
# are spooled and a reference is enqueued — all four stages run afterwards.
|
# are spooled and a reference is enqueued, and all four stages run afterwards.
|
||||||
# So real throughput is the *arrival rate at the terminal sinks*
|
# So real throughput is the *arrival rate at the terminal sinks*
|
||||||
# (done/, text_done/, binary/, failed/), not the response rate. We upload a
|
# (done/, text_done/, binary/, failed/), not the response rate. We upload a
|
||||||
# corpus, then poll the sinks until the file count stops moving.
|
# corpus, then poll the sinks until the file count stops moving.
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
# 2. End-to-end throughput doesn't name the slow stage. The four stages run
|
# 2. End-to-end throughput doesn't name the slow stage. The four stages run
|
||||||
# concurrently behind their own queues, so the pipeline's rate is the
|
# concurrently behind their own queues, so the pipeline's rate is the
|
||||||
# slowest stage's rate and the others are invisible. Directory polling can't
|
# slowest stage's rate and the others are invisible. Directory polling can't
|
||||||
# recover them either — every in-flight file sits in spool/ whatever stage it
|
# recover them either: every in-flight file sits in spool/ whatever stage it
|
||||||
# is at, since stages route by enqueueing rather than by moving bytes. So the
|
# is at, since stages route by enqueueing rather than by moving bytes. So the
|
||||||
# server keeps per-stage counters
|
# server keeps per-stage counters
|
||||||
# (src/stats.jl) and we scrape GET /stats before and after: the deltas give
|
# (src/stats.jl) and we scrape GET /stats before and after: the deltas give
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
#
|
#
|
||||||
# The harness talks to the server only over HTTP (/upload, /health, /stats) and
|
# The harness talks to the server only over HTTP (/upload, /health, /stats) and
|
||||||
# reads the on-disk sink layout; it must run on the same machine (sink dirs and
|
# reads the on-disk sink layout; it must run on the same machine (sink dirs and
|
||||||
# /proc). If /stats is missing — an older build — everything else still works and
|
# /proc). If /stats is missing (an older build) everything else still works and
|
||||||
# the per-stage section is skipped.
|
# the per-stage section is skipped.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
# --files N number of files to upload (default: 200)
|
# --files N number of files to upload (default: 200)
|
||||||
# --size S size of each generated file, e.g. 4k, 512k, 8m, 1g (default: 64k)
|
# --size S size of each generated file, e.g. 4k, 512k, 8m, 1g (default: 64k)
|
||||||
# --concurrency J uploads in flight at once (default: 8)
|
# --concurrency J uploads in flight at once (default: 8)
|
||||||
# --kind K binary | text | mixed — what to generate (default: binary)
|
# --kind K binary | text | mixed: what to generate (default: binary)
|
||||||
# --corpus DIR upload an existing directory instead of generating
|
# --corpus DIR upload an existing directory instead of generating
|
||||||
# (the only way to exercise stage 2: point it at real known files)
|
# (the only way to exercise stage 2: point it at real known files)
|
||||||
# --keep-corpus don't delete the generated corpus on exit
|
# --keep-corpus don't delete the generated corpus on exit
|
||||||
@@ -152,7 +152,7 @@ sinkdirs() = (
|
|||||||
failed = get(ENV, "FS_FAILED_DIR", "data/failed"),
|
failed = get(ENV, "FS_FAILED_DIR", "data/failed"),
|
||||||
)
|
)
|
||||||
|
|
||||||
# One directory, not four. Files no longer move between stages — spool/ holds
|
# One directory, not four. Files no longer move between stages: spool/ holds
|
||||||
# every in-flight file at every stage, and which stage it has reached lives in
|
# every in-flight file at every stage, and which stage it has reached lives in
|
||||||
# the queue holding its reference (src/worker.jl header). So this depth is
|
# the queue holding its reference (src/worker.jl header). So this depth is
|
||||||
# "files in flight", full stop; per-stage depth comes from /stats, which is the
|
# "files in flight", full stop; per-stage depth comes from /stats, which is the
|
||||||
@@ -200,7 +200,7 @@ Find the running server process, or `nothing`.
|
|||||||
server: any shell launched with the command in its own argv (`sh -c 'julia …
|
server: any shell launched with the command in its own argv (`sh -c 'julia …
|
||||||
bin/server.jl > log'`, a `setsid`/`nohup` wrapper, even the terminal running the
|
bin/server.jl > log'`, a `setsid`/`nohup` wrapper, even the terminal running the
|
||||||
benchmark) matches the same pattern. Sampling one of those reports a few MiB of
|
benchmark) matches the same pattern. Sampling one of those reports a few MiB of
|
||||||
shell as the server's memory — a wrong answer that looks plausible, which is the
|
shell as the server's memory: a wrong answer that looks plausible, which is the
|
||||||
worst kind.
|
worst kind.
|
||||||
|
|
||||||
So candidates are filtered by what each process *is* (`/proc/<pid>/comm`, the
|
So candidates are filtered by what each process *is* (`/proc/<pid>/comm`, the
|
||||||
@@ -309,7 +309,7 @@ function stage_deltas(before, after, peak_depth::Dict{Int,Int})
|
|||||||
end
|
end
|
||||||
|
|
||||||
"JSON has no NaN. A stage that completed nothing has no service time, and `null`
|
"JSON has no NaN. A stage that completed nothing has no service time, and `null`
|
||||||
is the honest way to say that — writing NaN just makes JSON3 throw."
|
is the honest way to say that; writing NaN just makes JSON3 throw."
|
||||||
json_num(x::Real) = isfinite(x) ? x : nothing
|
json_num(x::Real) = isfinite(x) ? x : nothing
|
||||||
|
|
||||||
pad(s, n) = rpad(string(s), n)
|
pad(s, n) = rpad(string(s), n)
|
||||||
@@ -321,7 +321,7 @@ Print the per-stage table and say which stage is the bottleneck.
|
|||||||
The verdict reads utilization, not throughput: in a pipeline every stage
|
The verdict reads utilization, not throughput: in a pipeline every stage
|
||||||
completes the same files, so at steady state they all report nearly the same
|
completes the same files, so at steady state they all report nearly the same
|
||||||
files/s regardless of which one is the constraint. What separates them is how
|
files/s regardless of which one is the constraint. What separates them is how
|
||||||
hard each pool had to work to keep up — the bottleneck is pinned near 1.0 while
|
hard each pool had to work to keep up: the bottleneck is pinned near 1.0 while
|
||||||
its neighbours idle.
|
its neighbours idle.
|
||||||
"""
|
"""
|
||||||
function stage_report(deltas::Vector{StageDelta}, window::Float64)
|
function stage_report(deltas::Vector{StageDelta}, window::Float64)
|
||||||
@@ -356,14 +356,14 @@ function stage_report(deltas::Vector{StageDelta}, window::Float64)
|
|||||||
"$(fmt(utilization(top, window) * 100, 0))% utilization of " *
|
"$(fmt(utilization(top, window) * 100, 0))% utilization of " *
|
||||||
"$(top.workers) worker(s)")
|
"$(top.workers) worker(s)")
|
||||||
if utilization(top, window) < 0.5
|
if utilization(top, window) < 0.5
|
||||||
println(" — but no stage is near saturated: the pipeline is " *
|
println(" ...but no stage is near saturated: the pipeline is " *
|
||||||
"waiting on intake,\n not on itself. Raise --concurrency " *
|
"waiting on intake,\n not on itself. Raise --concurrency " *
|
||||||
"or --files to load it properly.")
|
"or --files to load it properly.")
|
||||||
end
|
end
|
||||||
for d in worked
|
for d in worked
|
||||||
blocked_share(d) > 0.25 && println(" ! stage $(d.stage) ($(d.name)) spent " *
|
blocked_share(d) > 0.25 && println(" ! stage $(d.stage) ($(d.name)) spent " *
|
||||||
"$(fmt(blocked_share(d) * 100, 0))% of its time parked on a full downstream " *
|
"$(fmt(blocked_share(d) * 100, 0))% of its time parked on a full downstream " *
|
||||||
"queue —\n it is being held up by the stage after it, not doing that work itself.")
|
"queue.\n It is being held up by the stage after it, not doing that work itself.")
|
||||||
end
|
end
|
||||||
return nothing
|
return nothing
|
||||||
end
|
end
|
||||||
@@ -459,7 +459,7 @@ end
|
|||||||
Upload every path, at most `concurrency` in flight.
|
Upload every path, at most `concurrency` in flight.
|
||||||
|
|
||||||
A bounded set of worker tasks pulling from a shared index keeps exactly
|
A bounded set of worker tasks pulling from a shared index keeps exactly
|
||||||
`concurrency` requests in flight for the whole run — unlike batching, where each
|
`concurrency` requests in flight for the whole run, unlike batching, where each
|
||||||
batch stalls on its slowest (largest) file and the real concurrency sags.
|
batch stalls on its slowest (largest) file and the real concurrency sags.
|
||||||
"""
|
"""
|
||||||
function upload_all(url::String, paths::Vector{String}, concurrency::Int)
|
function upload_all(url::String, paths::Vector{String}, concurrency::Int)
|
||||||
@@ -504,7 +504,7 @@ function main(argv)
|
|||||||
try
|
try
|
||||||
HTTP.get(string(rstrip(url, '/'), "/health"); retry = false, readtimeout = 5)
|
HTTP.get(string(rstrip(url, '/'), "/health"); retry = false, readtimeout = 5)
|
||||||
catch e
|
catch e
|
||||||
println(stderr, "cannot reach $url/health — is the server running?")
|
println(stderr, "cannot reach $url/health. Is the server running?")
|
||||||
println(stderr, " start it with: julia --project=. -t auto bin/server.jl")
|
println(stderr, " start it with: julia --project=. -t auto bin/server.jl")
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
@@ -548,7 +548,7 @@ function main(argv)
|
|||||||
"reporting sampled RSS only"
|
"reporting sampled RSS only"
|
||||||
# Baseline is read *after* the reset, not before. VmHWM restarts
|
# Baseline is read *after* the reset, not before. VmHWM restarts
|
||||||
# from whatever RSS is at the moment of the reset, so a baseline
|
# from whatever RSS is at the moment of the reset, so a baseline
|
||||||
# sampled earlier is measured against a different origin — and if
|
# sampled earlier is measured against a different origin, and if
|
||||||
# the GC hands memory back in between, the run reports negative
|
# the GC hands memory back in between, the run reports negative
|
||||||
# growth, which is nonsense on its face.
|
# growth, which is nonsense on its face.
|
||||||
r2 = read_rss(pid)
|
r2 = read_rss(pid)
|
||||||
@@ -587,8 +587,8 @@ function main(argv)
|
|||||||
depth_max[k] = max(depth_max[k], getfield(d, k))
|
depth_max[k] = max(depth_max[k], getfield(d, k))
|
||||||
end
|
end
|
||||||
# Queue depth, unlike directory depth, can't be missed by a slow
|
# Queue depth, unlike directory depth, can't be missed by a slow
|
||||||
# sample in the same way — a file's *reference* sits in the queue
|
# sample in the same way, since a file's *reference* sits in the
|
||||||
# for the whole time it waits — so this is the depth the stage
|
# queue for the whole time it waits, so this is the depth the stage
|
||||||
# table reports.
|
# table reports.
|
||||||
if stats_before !== nothing
|
if stats_before !== nothing
|
||||||
s = scrape_stats(url)
|
s = scrape_stats(url)
|
||||||
@@ -673,7 +673,7 @@ function main(argv)
|
|||||||
"$(human(corpusbytes / length(paths))) avg")
|
"$(human(corpusbytes / length(paths))) avg")
|
||||||
println("concurrency $(opts["concurrency"])")
|
println("concurrency $(opts["concurrency"])")
|
||||||
println()
|
println()
|
||||||
println("INTAKE (HTTP 202 — bytes spooled, not processed)")
|
println("INTAKE (HTTP 202: bytes spooled, not processed)")
|
||||||
println(" accepted $accepted of $(length(paths)) [202: $n_202, 503: $n_503, error: $n_err]")
|
println(" accepted $accepted of $(length(paths)) [202: $n_202, 503: $n_503, error: $n_err]")
|
||||||
println(" wall $(fmt(intake_secs))s")
|
println(" wall $(fmt(intake_secs))s")
|
||||||
println(" rate $(fmt(accepted / max(intake_secs, 1e-9))) files/s, " *
|
println(" rate $(fmt(accepted / max(intake_secs, 1e-9))) files/s, " *
|
||||||
@@ -700,7 +700,7 @@ function main(argv)
|
|||||||
println("SERVER MEMORY (pid $pid)")
|
println("SERVER MEMORY (pid $pid)")
|
||||||
println(" baseline RSS $(human(baseline_rss))")
|
println(" baseline RSS $(human(baseline_rss))")
|
||||||
println(" peak RSS $(human(peak_rss))" *
|
println(" peak RSS $(human(peak_rss))" *
|
||||||
(peak_reset ? " (kernel VmHWM, reset at start)" : " (sampled — may miss spikes)"))
|
(peak_reset ? " (kernel VmHWM, reset at start)" : " (sampled; may miss spikes)"))
|
||||||
growth = peak_rss - baseline_rss
|
growth = peak_rss - baseline_rss
|
||||||
if growth <= 0
|
if growth <= 0
|
||||||
# RSS never got back to where it started, so the run's own cost
|
# RSS never got back to where it started, so the run's own cost
|
||||||
@@ -708,13 +708,13 @@ function main(argv)
|
|||||||
# Printing a negative "growth" would invite reading a memory
|
# Printing a negative "growth" would invite reading a memory
|
||||||
# *saving* into what is really "too small to measure here".
|
# *saving* into what is really "too small to measure here".
|
||||||
println(" growth none measurable (peak never exceeded the baseline)")
|
println(" growth none measurable (peak never exceeded the baseline)")
|
||||||
println(" The baseline was still falling when we sampled it — give the")
|
println(" The baseline was still falling when we sampled it. Give the")
|
||||||
println(" server ~30s to settle after startup for a comparable figure.")
|
println(" server ~30s to settle after startup for a comparable figure.")
|
||||||
else
|
else
|
||||||
println(" growth $(human(growth))")
|
println(" growth $(human(growth))")
|
||||||
println(" per in-flight $(human(growth / opts["concurrency"])) " *
|
println(" per in-flight $(human(growth / opts["concurrency"])) " *
|
||||||
"at $(human(corpusbytes / length(paths))) avg file size")
|
"at $(human(corpusbytes / length(paths))) avg file size")
|
||||||
println(" (should not grow with file size — intake streams to disk)")
|
println(" (should not grow with file size: intake streams to disk)")
|
||||||
end
|
end
|
||||||
# Julia's GC returns memory to the OS lazily, so a second run on the
|
# Julia's GC returns memory to the OS lazily, so a second run on the
|
||||||
# same process starts from an inflated baseline and under-reports
|
# same process starts from an inflated baseline and under-reports
|
||||||
@@ -729,7 +729,7 @@ function main(argv)
|
|||||||
println("=" ^ 68)
|
println("=" ^ 68)
|
||||||
|
|
||||||
sink_delta.failed > 0 &&
|
sink_delta.failed > 0 &&
|
||||||
println("\nnote: $(sink_delta.failed) file(s) landed in $(sinks.failed) — check the server log.")
|
println("\nnote: $(sink_delta.failed) file(s) landed in $(sinks.failed); check the server log.")
|
||||||
timed_out &&
|
timed_out &&
|
||||||
println("\nnote: drain stalled with $(accepted - completed) file(s) outstanding. " *
|
println("\nnote: drain stalled with $(accepted - completed) file(s) outstanding. " *
|
||||||
"Check the server log and spool/; raise --timeout if the pipeline is just slow.")
|
"Check the server log and spool/; raise --timeout if the pipeline is just slow.")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env julia
|
#!/usr/bin/env julia
|
||||||
#
|
#
|
||||||
# bench_model.jl — microbenchmark the classifier in isolation, with no server,
|
# bench_model.jl: microbenchmark the classifier in isolation, with no server,
|
||||||
# no queue, and no disk in the way.
|
# no queue, and no disk in the way.
|
||||||
#
|
#
|
||||||
# bin/bench.jl measures the *pipeline*: it reports stage 1 as one number, the
|
# bin/bench.jl measures the *pipeline*: it reports stage 1 as one number, the
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
#
|
#
|
||||||
# read_features open, read 16 bytes, seek, read 16 bytes, scale
|
# read_features open, read 16 bytes, seek, read 16 bytes, scale
|
||||||
# Lux.apply the network itself, on a feature vector already in memory
|
# Lux.apply the network itself, on a feature vector already in memory
|
||||||
# classify both together — what stage 1 actually calls per file
|
# classify both together: what stage 1 actually calls per file
|
||||||
#
|
#
|
||||||
# Three properties are worth checking beyond the raw per-file cost:
|
# Three properties are worth checking beyond the raw per-file cost:
|
||||||
#
|
#
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
# (This is the same claim bin/bench.jl makes about memory, on the CPU axis.)
|
# (This is the same claim bin/bench.jl makes about memory, on the CPU axis.)
|
||||||
# * Batching should be much cheaper per file. A 32x1 matmul wastes most of a
|
# * Batching should be much cheaper per file. A 32x1 matmul wastes most of a
|
||||||
# BLAS call; if batch-64 inference is many times cheaper per file, that is
|
# BLAS call; if batch-64 inference is many times cheaper per file, that is
|
||||||
# the headroom a batching stage-1 would buy — worth knowing before building
|
# the headroom a batching stage-1 would buy, worth knowing before building
|
||||||
# one, since today the pipeline classifies strictly one file at a time.
|
# one, since today the pipeline classifies strictly one file at a time.
|
||||||
# * Inference should scale across threads. `Classifier` is shared read-only by
|
# * Inference should scale across threads. `Classifier` is shared read-only by
|
||||||
# the whole stage-1 pool on the claim that Lux inference is pure. If per-file
|
# the whole stage-1 pool on the claim that Lux inference is pure. If per-file
|
||||||
@@ -48,7 +48,7 @@ using Statistics
|
|||||||
using Printf
|
using Printf
|
||||||
|
|
||||||
# The script is run directly, not as part of the package, so pull in exactly the
|
# The script is run directly, not as part of the package, so pull in exactly the
|
||||||
# pieces the classifier needs. `Lux`/`JLD2` first — model.jl and classify.jl both
|
# pieces the classifier needs. `Lux`/`JLD2` first, because model.jl and classify.jl both
|
||||||
# assume the including scope already has them (see the note at the top of model.jl).
|
# assume the including scope already has them (see the note at the top of model.jl).
|
||||||
using Lux
|
using Lux
|
||||||
using JLD2
|
using JLD2
|
||||||
@@ -156,7 +156,7 @@ fmt2(x::Real) = @sprintf("%.2f", x)
|
|||||||
"""
|
"""
|
||||||
control_kernel(x) -> Float64
|
control_kernel(x) -> Float64
|
||||||
|
|
||||||
Pure arithmetic, no allocation, no library call — deliberately dependent
|
Pure arithmetic, no allocation, no library call, and deliberately dependent
|
||||||
(each step needs the last) so the compiler can't vectorize it away, and sized to
|
(each step needs the last) so the compiler can't vectorize it away, and sized to
|
||||||
land in the same microsecond neighbourhood as one `Lux.apply`.
|
land in the same microsecond neighbourhood as one `Lux.apply`.
|
||||||
"""
|
"""
|
||||||
@@ -209,7 +209,7 @@ end
|
|||||||
"""
|
"""
|
||||||
Write a file of exactly `size` random bytes, in bounded chunks.
|
Write a file of exactly `size` random bytes, in bounded chunks.
|
||||||
|
|
||||||
Content is random rather than zeros so the classifier sees a realistic input —
|
Content is random rather than zeros so the classifier sees a realistic input,
|
||||||
and so the filesystem can't cheat with a sparse file, which would make the tail
|
and so the filesystem can't cheat with a sparse file, which would make the tail
|
||||||
`seek` unrepresentatively fast.
|
`seek` unrepresentatively fast.
|
||||||
"""
|
"""
|
||||||
@@ -252,7 +252,7 @@ function main(argv)
|
|||||||
Lux.apply(clf.model, x1, clf.ps, clf.st)
|
Lux.apply(clf.model, x1, clf.ps, clf.st)
|
||||||
end
|
end
|
||||||
println()
|
println()
|
||||||
println("INFERENCE (Lux.apply, batch 1 — features already in memory)")
|
println("INFERENCE (Lux.apply, batch 1; features already in memory)")
|
||||||
println(" per call $(human_time(infer_ns)) $(human_rate(rate(infer_ns)))")
|
println(" per call $(human_time(infer_ns)) $(human_rate(rate(infer_ns)))")
|
||||||
println(" allocations $(human_bytes(infer_bytes)) per call")
|
println(" allocations $(human_bytes(infer_bytes)) per call")
|
||||||
results["inference_batch1"] = (; ns = infer_ns, bytes = infer_bytes, per_sec = rate(infer_ns))
|
results["inference_batch1"] = (; ns = infer_ns, bytes = infer_bytes, per_sec = rate(infer_ns))
|
||||||
@@ -302,14 +302,14 @@ function main(argv)
|
|||||||
results["read_features"] = read_rows
|
results["read_features"] = read_rows
|
||||||
flat = length(read_rows) > 1 ?
|
flat = length(read_rows) > 1 ?
|
||||||
maximum(r.ns for r in read_rows) / minimum(r.ns for r in read_rows) : 1.0
|
maximum(r.ns for r in read_rows) / minimum(r.ns for r in read_rows) : 1.0
|
||||||
@printf(" spread across a %.0fx size range: %.1fx — %s\n",
|
@printf(" spread across a %.0fx size range: %.1fx, %s\n",
|
||||||
maximum(sizes) / minimum(sizes), flat,
|
maximum(sizes) / minimum(sizes), flat,
|
||||||
flat < 3 ? "flat, as designed (it seeks to the tail)" :
|
flat < 3 ? "flat, as designed (it seeks to the tail)" :
|
||||||
"NOT flat: something is reading more than 32 bytes")
|
"NOT flat: something is reading more than 32 bytes")
|
||||||
|
|
||||||
# --- 4. classify(): what stage 1 calls, I/O and inference together.
|
# --- 4. classify(): what stage 1 calls, I/O and inference together.
|
||||||
println()
|
println()
|
||||||
println("CLASSIFY (read_features + Lux.apply — one whole stage-1 file)")
|
println("CLASSIFY (read_features + Lux.apply; one whole stage-1 file)")
|
||||||
dir2 = mktempdir(; prefix = "fsmodel-")
|
dir2 = mktempdir(; prefix = "fsmodel-")
|
||||||
classify_ns = 0.0
|
classify_ns = 0.0
|
||||||
try
|
try
|
||||||
@@ -378,7 +378,7 @@ function main(argv)
|
|||||||
end
|
end
|
||||||
results["thread_scaling"] = thread_rows
|
results["thread_scaling"] = thread_rows
|
||||||
|
|
||||||
# A poor scaling curve has two possible authors — the model or the box —
|
# A poor scaling curve has two possible authors, the model or the box,
|
||||||
# and the table alone can't tell them apart. So run the same sweep on a
|
# and the table alone can't tell them apart. So run the same sweep on a
|
||||||
# kernel that is pure arithmetic with no allocation and no library
|
# kernel that is pure arithmetic with no allocation and no library
|
||||||
# underneath: whatever *it* achieves is this machine's ceiling for
|
# underneath: whatever *it* achieves is this machine's ceiling for
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env julia
|
#!/usr/bin/env julia
|
||||||
#
|
#
|
||||||
# bench_stage1.jl — take stage 1 apart and find the slowest component.
|
# bench_stage1.jl: take stage 1 apart and find the slowest component.
|
||||||
#
|
#
|
||||||
# bin/bench.jl reports stage 1 as a single number (the wall time of
|
# bin/bench.jl reports stage 1 as a single number (the wall time of
|
||||||
# `handle_classify_job` under whole-pipeline contention) and bin/bench_model.jl
|
# `handle_classify_job` under whole-pipeline contention) and bin/bench_model.jl
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
# `handle_classify_job` end to end so the parts can be checked against the whole.
|
# `handle_classify_job` end to end so the parts can be checked against the whole.
|
||||||
# The two knobs that most change the answer get their own sweeps:
|
# The two knobs that most change the answer get their own sweeps:
|
||||||
#
|
#
|
||||||
# * Logger. The server runs `FlushLogger(ConsoleLogger(stderr))` — it formats
|
# * Logger. The server runs `FlushLogger(ConsoleLogger(stderr))`, which formats
|
||||||
# and flushes every message. Under redirect (a log file, journald) that is a
|
# and flushes every message. Under redirect (a log file, journald) that is a
|
||||||
# syscall per line, two lines per file, on the hot path. We time the handler
|
# syscall per line, two lines per file, on the hot path. We time the handler
|
||||||
# under a null logger, a formatting-but-discarding logger, and the real
|
# under a null logger, a formatting-but-discarding logger, and the real
|
||||||
@@ -112,7 +112,7 @@ const SINK = Ref{Any}(nothing)
|
|||||||
|
|
||||||
Run `pass()` `trials` times and report the fastest, in nanoseconds per operation
|
Run `pass()` `trials` times and report the fastest, in nanoseconds per operation
|
||||||
(`pass` returns the number of operations it performed). `prepare()` runs before
|
(`pass` returns the number of operations it performed). `prepare()` runs before
|
||||||
each pass and is *not* timed — that is where a benchmark resets whatever its
|
each pass and is *not* timed: that is where a benchmark resets whatever its
|
||||||
last pass consumed (today: the queues). `pass` comes first so callers can pass it as a `do` block.
|
last pass consumed (today: the queues). `pass` comes first so callers can pass it as a `do` block.
|
||||||
|
|
||||||
The first pass is thrown away: it pays Julia's JIT compilation, which on calls
|
The first pass is thrown away: it pays Julia's JIT compilation, which on calls
|
||||||
@@ -164,7 +164,7 @@ end
|
|||||||
"""
|
"""
|
||||||
Write a file of exactly `size` random bytes, in bounded chunks.
|
Write a file of exactly `size` random bytes, in bounded chunks.
|
||||||
|
|
||||||
Content is random rather than zeros so the classifier sees a realistic input —
|
Content is random rather than zeros so the classifier sees a realistic input,
|
||||||
and so the filesystem can't cheat with a sparse file, which would make the tail
|
and so the filesystem can't cheat with a sparse file, which would make the tail
|
||||||
`seek` unrepresentatively fast.
|
`seek` unrepresentatively fast.
|
||||||
"""
|
"""
|
||||||
@@ -185,7 +185,7 @@ end
|
|||||||
make_corpus(cfg, n, size, rng) -> Vector{Job}
|
make_corpus(cfg, n, size, rng) -> Vector{Job}
|
||||||
|
|
||||||
Create `n` spooled files and the `Job` references a stage-1 worker would dequeue
|
Create `n` spooled files and the `Job` references a stage-1 worker would dequeue
|
||||||
for them — the exact input `handle_classify_job` sees.
|
for them: the exact input `handle_classify_job` sees.
|
||||||
"""
|
"""
|
||||||
function make_corpus(cfg::FS.Config, n::Int, size::Int, rng)
|
function make_corpus(cfg::FS.Config, n::Int, size::Int, rng)
|
||||||
jobs = FS.Job[]
|
jobs = FS.Job[]
|
||||||
@@ -218,12 +218,12 @@ end
|
|||||||
|
|
||||||
Run `f` under one of the three loggers the cost of logging is bracketed by:
|
Run `f` under one of the three loggers the cost of logging is bracketed by:
|
||||||
|
|
||||||
* `:null` — `NullLogger`: the `@info` macro's own overhead, nothing else.
|
* `:null` `NullLogger`: the `@info` macro's own overhead, nothing else.
|
||||||
* `:format` — `ConsoleLogger` to `devnull`: message formatting and key/value
|
* `:format` `ConsoleLogger` to `devnull`: message formatting and key/value
|
||||||
interpolation, but no I/O.
|
interpolation, but no I/O.
|
||||||
* `:flush` — `FlushLogger(ConsoleLogger(io))` to a real file: what
|
* `:flush` `FlushLogger(ConsoleLogger(io))` to a real file: what
|
||||||
`FileServer.run` installs, under the redirect it was written for.
|
`FileServer.run` installs, under the redirect it was written for.
|
||||||
* `:debug` — the same, at `Debug` level: the stage's per-file lines are
|
* `:debug` the same, at `Debug` level: the stage's per-file lines are
|
||||||
`@debug`, so this is the equivalent of running the server with
|
`@debug`, so this is the equivalent of running the server with
|
||||||
`JULIA_DEBUG=FileServer` and the only setting under which they
|
`JULIA_DEBUG=FileServer` and the only setting under which they
|
||||||
are emitted at all.
|
are emitted at all.
|
||||||
@@ -380,8 +380,8 @@ end
|
|||||||
thread_rows(cfg, jobs, opts) -> Vector
|
thread_rows(cfg, jobs, opts) -> Vector
|
||||||
|
|
||||||
Run the full handler across worker counts, under the server's real logger. A
|
Run the full handler across worker counts, under the server's real logger. A
|
||||||
component that owns a lock — the queue's condition variable, the logger's
|
component that owns a lock (the queue's condition variable, the logger's
|
||||||
stream — stops scaling here even though it looked cheap single-threaded, so this
|
stream) stops scaling here even though it looked cheap single-threaded, so this
|
||||||
is where the single-thread ranking gets checked against the deployed one.
|
is where the single-thread ranking gets checked against the deployed one.
|
||||||
"""
|
"""
|
||||||
function thread_rows(cfg::FS.Config, jobs::Vector{FS.Job}, opts)
|
function thread_rows(cfg::FS.Config, jobs::Vector{FS.Job}, opts)
|
||||||
@@ -402,7 +402,7 @@ function thread_rows(cfg::FS.Config, jobs::Vector{FS.Job}, opts)
|
|||||||
ns = with_logger_named(:flush, logfile) do
|
ns = with_logger_named(:flush, logfile) do
|
||||||
best_of(() -> (drain!(known); drain!(unknown)); trials) do
|
best_of(() -> (drain!(known); drain!(unknown)); trials) do
|
||||||
# Static split: each task takes a contiguous slice, so the only
|
# Static split: each task takes a contiguous slice, so the only
|
||||||
# sharing between workers is the state the server also shares —
|
# sharing between workers is the state the server also shares:
|
||||||
# the classifier, the queues, the logger, the filesystem.
|
# the classifier, the queues, the logger, the filesystem.
|
||||||
chunk = cld(nfiles, k)
|
chunk = cld(nfiles, k)
|
||||||
@sync for t in 1:k
|
@sync for t in 1:k
|
||||||
@@ -490,7 +490,7 @@ function main(argv)
|
|||||||
# flushing logger at Info level, one worker. Percentages are shares of
|
# flushing logger at Info level, one worker. Percentages are shares of
|
||||||
# that, so they are directly comparable and the parts can be checked
|
# that, so they are directly comparable and the parts can be checked
|
||||||
# against the whole. The JULIA_DEBUG row is deliberately *not* the
|
# against the whole. The JULIA_DEBUG row is deliberately *not* the
|
||||||
# baseline — it is the opt-in configuration, and letting it set the scale
|
# baseline. It is the opt-in configuration, and letting it set the scale
|
||||||
# would make every other component look free.
|
# would make every other component look free.
|
||||||
total = only(r.ns for r in handlers if r.name == "handle_classify_job (flush→file)")
|
total = only(r.ns for r in handlers if r.name == "handle_classify_job (flush→file)")
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env julia
|
#!/usr/bin/env julia
|
||||||
#
|
#
|
||||||
# bench_stage2.jl — take stage 2 apart and find the slowest component.
|
# bench_stage2.jl: take stage 2 apart and find the slowest component.
|
||||||
#
|
#
|
||||||
# bin/bench.jl reports stage 2 as a single number (its throughput and worker
|
# bin/bench.jl reports stage 2 as a single number (its throughput and worker
|
||||||
# utilization under whole-pipeline contention). It doesn't say *which part* of
|
# utilization under whole-pipeline contention). It doesn't say *which part* of
|
||||||
@@ -27,13 +27,13 @@
|
|||||||
#
|
#
|
||||||
# * The corpus must be real files. exiftool's cost depends on what it finds;
|
# * The corpus must be real files. exiftool's cost depends on what it finds;
|
||||||
# random bytes exit early and would understate the stage by a lot. The
|
# random bytes exit early and would understate the stage by a lot. The
|
||||||
# default corpus is `data/done` — files that already went through stage 2 on
|
# default corpus is `data/done`, files that already went through stage 2 on
|
||||||
# this machine — copied back into a scratch spool/ dir.
|
# this machine, copied back into a scratch spool/ dir.
|
||||||
# * Two rows price the *alternatives* to one-fork-per-file, because if the
|
# * Two rows price the *alternatives* to one-fork-per-file, because if the
|
||||||
# fork dominates then the only fixes are to stop paying it per file:
|
# fork dominates then the only fixes are to stop paying it per file:
|
||||||
# `exiftool (batched Nx)` runs the whole corpus through one process, and
|
# `exiftool (batched Nx)` runs the whole corpus through one process, and
|
||||||
# `exiftool (-stay_open)` keeps a single process alive and feeds it one file
|
# `exiftool (-stay_open)` keeps a single process alive and feeds it one file
|
||||||
# at a time over a pipe — the shape a streaming pipeline could actually use.
|
# at a time over a pipe: the shape a streaming pipeline could actually use.
|
||||||
# Both are measured, not assumed.
|
# Both are measured, not assumed.
|
||||||
# * `run_with_timeout` gets its own row *next to* a bare `Base.run` of the same
|
# * `run_with_timeout` gets its own row *next to* a bare `Base.run` of the same
|
||||||
# command. The difference is what the watchdog costs, and its polling loop
|
# command. The difference is what the watchdog costs, and its polling loop
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
# julia --project=. -t auto bin/bench_stage2.jl [options]
|
# julia --project=. -t auto bin/bench_stage2.jl [options]
|
||||||
#
|
#
|
||||||
# --files N corpus files per timed pass (default: 48). The concurrency
|
# --files N corpus files per timed pass (default: 48). The concurrency
|
||||||
# sweep wants more than the component rows do — with a single
|
# sweep wants more than the component rows do. With a single
|
||||||
# 2 s file in the corpus, 48 files can't show more than ~4x no
|
# 2 s file in the corpus, 48 files can't show more than ~4x no
|
||||||
# matter how many workers run, so pass --files 150 when the
|
# matter how many workers run, so pass --files 150 when the
|
||||||
# question is scaling.
|
# question is scaling.
|
||||||
@@ -121,7 +121,7 @@ const SINK = Ref{Any}(nothing)
|
|||||||
|
|
||||||
Run `pass()` `trials` times and report the fastest, in nanoseconds per operation
|
Run `pass()` `trials` times and report the fastest, in nanoseconds per operation
|
||||||
(`pass` returns the number of operations it performed). `prepare()` runs before
|
(`pass` returns the number of operations it performed). `prepare()` runs before
|
||||||
each pass and is *not* timed — that is where a consuming benchmark puts the file
|
each pass and is *not* timed: that is where a consuming benchmark puts the file
|
||||||
back where it started. `pass` comes first so callers can pass it as a `do` block.
|
back where it started. `pass` comes first so callers can pass it as a `do` block.
|
||||||
|
|
||||||
The first pass is thrown away: it pays Julia's JIT compilation, which on calls
|
The first pass is thrown away: it pays Julia's JIT compilation, which on calls
|
||||||
@@ -174,12 +174,12 @@ end
|
|||||||
make_corpus(cfg, corpus_dir, n) -> Vector{Job}
|
make_corpus(cfg, corpus_dir, n) -> Vector{Job}
|
||||||
|
|
||||||
Copy up to `n` real files from `corpus_dir` into `spool/` and build the `Job`
|
Copy up to `n` real files from `corpus_dir` into `spool/` and build the `Job`
|
||||||
references a stage-2 worker would dequeue for them — the exact input
|
references a stage-2 worker would dequeue for them: the exact input
|
||||||
`handle_known_job` sees.
|
`handle_known_job` sees.
|
||||||
|
|
||||||
Real files, not generated ones: exiftool's cost is a function of what it can
|
Real files, not generated ones: exiftool's cost is a function of what it can
|
||||||
parse, and a file of random bytes bails out early enough to understate the stage
|
parse, and a file of random bytes bails out early enough to understate the stage
|
||||||
by an order of magnitude. `.meta.json` sidecars are skipped — they are stage-2
|
by an order of magnitude. `.meta.json` sidecars are skipped, since they are stage-2
|
||||||
*output*, and enriching them would measure the wrong population.
|
*output*, and enriching them would measure the wrong population.
|
||||||
"""
|
"""
|
||||||
function make_corpus(cfg::FS.Config, corpus_dir::AbstractString, n::Int)
|
function make_corpus(cfg::FS.Config, corpus_dir::AbstractString, n::Int)
|
||||||
@@ -211,7 +211,7 @@ end
|
|||||||
|
|
||||||
Put every corpus file back in `spool/`, wherever the last pass left it (done/ or
|
Put every corpus file back in `spool/`, wherever the last pass left it (done/ or
|
||||||
already home), and delete any sidecar it produced. This is the untimed `prepare`
|
already home), and delete any sidecar it produced. This is the untimed `prepare`
|
||||||
step for benchmarks that consume their input by committing it — stage 2 still
|
step for benchmarks that consume their input by committing it. Stage 2 still
|
||||||
moves, because its move is the terminal commit, not an inter-stage hop.
|
moves, because its move is the terminal commit, not an inter-stage hop.
|
||||||
"""
|
"""
|
||||||
function respool!(cfg::FS.Config, jobs::Vector{FS.Job})
|
function respool!(cfg::FS.Config, jobs::Vector{FS.Job})
|
||||||
@@ -241,10 +241,10 @@ end
|
|||||||
|
|
||||||
Run `f` under one of the loggers the cost of logging is bracketed by:
|
Run `f` under one of the loggers the cost of logging is bracketed by:
|
||||||
|
|
||||||
* `:null` — `NullLogger`: the `@info` macro's own overhead, nothing else.
|
* `:null` `NullLogger`: the `@info` macro's own overhead, nothing else.
|
||||||
* `:format` — `ConsoleLogger` to `devnull`: message formatting and key/value
|
* `:format` `ConsoleLogger` to `devnull`: message formatting and key/value
|
||||||
interpolation, but no I/O.
|
interpolation, but no I/O.
|
||||||
* `:flush` — `FlushLogger(ConsoleLogger(io))` to a real file: what
|
* `:flush` `FlushLogger(ConsoleLogger(io))` to a real file: what
|
||||||
`FileServer.run` installs, under the redirect it was written
|
`FileServer.run` installs, under the redirect it was written
|
||||||
for. Stage 2's per-file line is `@info`, not `@debug`, so this
|
for. Stage 2's per-file line is `@info`, not `@debug`, so this
|
||||||
row is what the deployed server actually pays.
|
row is what the deployed server actually pays.
|
||||||
@@ -286,7 +286,7 @@ end
|
|||||||
|
|
||||||
Run the whole corpus through *one* `exiftool` process and divide by the file
|
Run the whole corpus through *one* `exiftool` process and divide by the file
|
||||||
count. This is the floor for "what does exiftool cost if you stop paying the
|
count. This is the floor for "what does exiftool cost if you stop paying the
|
||||||
interpreter startup per file" — the fork, the Perl boot and the module loads are
|
interpreter startup per file": the fork, the Perl boot and the module loads are
|
||||||
paid once for the batch instead of once per file.
|
paid once for the batch instead of once per file.
|
||||||
"""
|
"""
|
||||||
function batched_ns(paths::Vector{String}, trials::Int)
|
function batched_ns(paths::Vector{String}, trials::Int)
|
||||||
@@ -301,8 +301,8 @@ end
|
|||||||
|
|
||||||
Feed files one at a time to a single long-lived `exiftool -stay_open True -@ -`
|
Feed files one at a time to a single long-lived `exiftool -stay_open True -@ -`
|
||||||
process over a pipe, reading its `{ready}` sentinel after each. Unlike the
|
process over a pipe, reading its `{ready}` sentinel after each. Unlike the
|
||||||
batched row this preserves the pipeline's actual shape — one file in, one result
|
batched row this preserves the pipeline's actual shape (one file in, one result
|
||||||
out, arriving whenever it arrives — so it prices the realistic fix rather than
|
out, arriving whenever it arrives) so it prices the realistic fix rather than
|
||||||
an unrealistic one.
|
an unrealistic one.
|
||||||
"""
|
"""
|
||||||
function stay_open_ns(paths::Vector{String}, trials::Int)
|
function stay_open_ns(paths::Vector{String}, trials::Int)
|
||||||
@@ -439,7 +439,7 @@ function component_rows(cfg::FS.Config, jobs::Vector{FS.Job}, opts)
|
|||||||
# One pass over the real sidecar population, not `reps` of them. Two reasons,
|
# One pass over the real sidecar population, not `reps` of them. Two reasons,
|
||||||
# and the first is a correctness trap: thousands of back-to-back fsyncs
|
# and the first is a correctness trap: thousands of back-to-back fsyncs
|
||||||
# saturate the device's write cache and each one starts waiting on the
|
# saturate the device's write cache and each one starts waiting on the
|
||||||
# queue, which reported this row at 16 ms/file — eight times the whole
|
# queue, which reported this row at 16 ms/file: eight times the whole
|
||||||
# `commit_enriched!` that contains it. The real stage fsyncs once per file
|
# `commit_enriched!` that contains it. The real stage fsyncs once per file
|
||||||
# with ~160 ms of exiftool between, and never queues that way. Second, real
|
# with ~160 ms of exiftool between, and never queues that way. Second, real
|
||||||
# sidecars vary hugely in size (a zip's raw dump dwarfs a jpeg's), so the
|
# sidecars vary hugely in size (a zip's raw dump dwarfs a jpeg's), so the
|
||||||
@@ -546,7 +546,7 @@ machine's cores, not about Julia.
|
|||||||
Workers pull from a shared atomic counter rather than taking a contiguous slice.
|
Workers pull from a shared atomic counter rather than taking a contiguous slice.
|
||||||
That matches the server (its pool pulls from one queue), and it matters here in a
|
That matches the server (its pool pulls from one queue), and it matters here in a
|
||||||
way it doesn't for stage 1: per-file exiftool time spans two orders of magnitude
|
way it doesn't for stage 1: per-file exiftool time spans two orders of magnitude
|
||||||
on a real corpus — a single 2 s archive among 48 files — so a static split leaves
|
on a real corpus (a single 2 s archive among 48 files), so a static split leaves
|
||||||
whichever worker drew it running alone while the rest idle, and the sweep would
|
whichever worker drew it running alone while the rest idle, and the sweep would
|
||||||
report a scaling ceiling that is really just load imbalance.
|
report a scaling ceiling that is really just load imbalance.
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
# recovered partition against magic-collapsed ground truth with ARI / V-measure,
|
# recovered partition against magic-collapsed ground truth with ARI / V-measure,
|
||||||
# grid-tunes (α, β, bg_mass, n), and cross-checks the winning config against a
|
# grid-tunes (α, β, bg_mass, n), and cross-checks the winning config against a
|
||||||
# model-free NCD (gzip) baseline (§8). The settings printed here are the ones the
|
# model-free NCD (gzip) baseline (§8). The settings printed here are the ones the
|
||||||
# machine rediscovers known formats at — copy the winner into config.jl.
|
# machine rediscovers known formats at; copy the winner into config.jl.
|
||||||
#
|
#
|
||||||
# julia --project=. bin/cluster_calibrate.jl [training_set_dir]
|
# julia --project=. bin/cluster_calibrate.jl [training_set_dir]
|
||||||
#
|
#
|
||||||
@@ -23,7 +23,7 @@ include(joinpath(@__DIR__, "..", "src", "cluster.jl"))
|
|||||||
|
|
||||||
The magic-collapsed format class of a file, read from its actual bytes (so
|
The magic-collapsed format class of a file, read from its actual bytes (so
|
||||||
docx≡zip and the whole ELF family merge, exactly the answer we want the
|
docx≡zip and the whole ELF family merge, exactly the answer we want the
|
||||||
clustering to reproduce). `tar` is detected by the `ustar` magic at offset 257 —
|
clustering to reproduce). `tar` is detected by the `ustar` magic at offset 257,
|
||||||
outside the model's front window, so tars are the accepted blind spot that
|
outside the model's front window, so tars are the accepted blind spot that
|
||||||
scatters to background.
|
scatters to background.
|
||||||
"""
|
"""
|
||||||
@@ -53,7 +53,7 @@ function gz_size(bytes::Vector{UInt8})
|
|||||||
return length(take!(out))
|
return length(take!(out))
|
||||||
end
|
end
|
||||||
|
|
||||||
"NCD(x,y) = (C(xy) - min(C(x),C(y))) / max(C(x),C(y)) — 0 = identical, ~1 = unrelated."
|
"NCD(x,y) = (C(xy) - min(C(x),C(y))) / max(C(x),C(y)); 0 = identical, ~1 = unrelated."
|
||||||
function ncd(xb, yb, cx, cy)
|
function ncd(xb, yb, cx, cy)
|
||||||
cxy = gz_size(vcat(xb, yb))
|
cxy = gz_size(vcat(xb, yb))
|
||||||
return (cxy - min(cx, cy)) / max(cx, cy)
|
return (cxy - min(cx, cy)) / max(cx, cy)
|
||||||
@@ -62,7 +62,7 @@ end
|
|||||||
"""
|
"""
|
||||||
ncd_1nn_purity(paths, truth; head_bytes) -> Float64
|
ncd_1nn_purity(paths, truth; head_bytes) -> Float64
|
||||||
|
|
||||||
Fraction of files whose NCD-nearest neighbour shares its true label — a cheap,
|
Fraction of files whose NCD-nearest neighbour shares its true label: a cheap,
|
||||||
O(N²) sanity read on how well raw gzip-similarity alone separates formats on the
|
O(N²) sanity read on how well raw gzip-similarity alone separates formats on the
|
||||||
same input. The Bayesian clusters should broadly agree; a big gap is a red flag
|
same input. The Bayesian clusters should broadly agree; a big gap is a red flag
|
||||||
(DESIGN §10.3). Uses each file's first `head_bytes` so the giant files don't
|
(DESIGN §10.3). Uses each file's first `head_bytes` so the giant files don't
|
||||||
@@ -173,7 +173,7 @@ function main()
|
|||||||
end
|
end
|
||||||
|
|
||||||
# Rank by ARI-excluding-tar (tar is the accepted blind spot; scoring it would
|
# Rank by ARI-excluding-tar (tar is the accepted blind spot; scoring it would
|
||||||
# penalise the correct answer of scattering tars to background — DESIGN §7.2).
|
# penalise the correct answer of scattering tars to background; DESIGN §7.2).
|
||||||
sort!(results; by=r -> r.e.ari_notar, rev=true)
|
sort!(results; by=r -> r.e.ari_notar, rev=true)
|
||||||
best = results[1]
|
best = results[1]
|
||||||
println()
|
println()
|
||||||
@@ -184,7 +184,7 @@ function main()
|
|||||||
|
|
||||||
# Per-cluster composition of the winning partition, and promotion nominations.
|
# Per-cluster composition of the winning partition, and promotion nominations.
|
||||||
pred = best.e.result.assignments
|
pred = best.e.result.assignments
|
||||||
println("\nwinning partition — cluster composition (truth breakdown):")
|
println("\nwinning partition, cluster composition (truth breakdown):")
|
||||||
for (id, c) in sort(collect(best.e.result.clusters); by=x -> -x[2].members)
|
for (id, c) in sort(collect(best.e.result.clusters); by=x -> -x[2].members)
|
||||||
members = [truth[i] for i in eachindex(pred) if pred[i] == id]
|
members = [truth[i] for i in eachindex(pred) if pred[i] == id]
|
||||||
comp = sort([(l, count(==(l), members)) for l in unique(members)]; by=x -> -x[2])
|
comp = sort([(l, count(==(l), members)) for l in unique(members)]; by=x -> -x[2])
|
||||||
@@ -211,7 +211,7 @@ function main()
|
|||||||
bay_pur = cluster_1nn_purity(rsub.assignments, subtruth)
|
bay_pur = cluster_1nn_purity(rsub.assignments, subtruth)
|
||||||
@printf(" subsample=%d NCD 1-NN label purity=%.3f Bayesian same-cluster purity=%.3f\n",
|
@printf(" subsample=%d NCD 1-NN label purity=%.3f Bayesian same-cluster purity=%.3f\n",
|
||||||
subn, ncd_pur, bay_pur)
|
subn, ncd_pur, bay_pur)
|
||||||
println(" (both high ⇒ header-byte signal agrees with model-free gzip similarity — DESIGN §10.3)")
|
println(" (both high ⇒ header-byte signal agrees with model-free gzip similarity; DESIGN §10.3)")
|
||||||
end
|
end
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
|||||||
@@ -3,14 +3,14 @@
|
|||||||
# Stage-5 phase-B runner (model/DESIGN_clustering.md §9): the single-owner,
|
# Stage-5 phase-B runner (model/DESIGN_clustering.md §9): the single-owner,
|
||||||
# periodic/cron process that sweeps `binary/`, folds new files into the durable
|
# periodic/cron process that sweeps `binary/`, folds new files into the durable
|
||||||
# format catalog by sequential CRP-predictive assignment, and (re)writes
|
# format catalog by sequential CRP-predictive assignment, and (re)writes
|
||||||
# promotion nominations. Run it single-threaded on a schedule — it is the ONLY
|
# promotion nominations. Run it single-threaded on a schedule: it is the ONLY
|
||||||
# writer of the catalog, so no locking is needed.
|
# writer of the catalog, so no locking is needed.
|
||||||
#
|
#
|
||||||
# julia --project=. bin/cluster_sweep.jl # incremental live sweep
|
# julia --project=. bin/cluster_sweep.jl # incremental live sweep
|
||||||
# julia --project=. bin/cluster_sweep.jl --compact # offline Gibbs (seed / recompact)
|
# julia --project=. bin/cluster_sweep.jl --compact # offline Gibbs (seed / recompact)
|
||||||
#
|
#
|
||||||
# On a fresh catalog (nothing processed yet) the incremental sweep would send
|
# On a fresh catalog (nothing processed yet) the incremental sweep would send
|
||||||
# every file to background — there are no clusters to match — so the first run
|
# every file to background (there are no clusters to match), so the first run
|
||||||
# auto-promotes to a compaction pass to seed the catalog. Configure via the
|
# auto-promotes to a compaction pass to seed the catalog. Configure via the
|
||||||
# FS_CLUSTER_* / FS_NOMINATED_DIR env vars (see src/config.jl).
|
# FS_CLUSTER_* / FS_NOMINATED_DIR env vars (see src/config.jl).
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ services:
|
|||||||
args:
|
args:
|
||||||
# false drops the Ruby toolchain and github-linguist (~160MB smaller).
|
# false drops the Ruby toolchain and github-linguist (~160MB smaller).
|
||||||
# Stage-4 text files then get natural-language enrichment but no
|
# Stage-4 text files then get natural-language enrichment but no
|
||||||
# programming language — the server warns at startup and carries on.
|
# programming language; the server warns at startup and carries on.
|
||||||
WITH_LINGUIST: "true"
|
WITH_LINGUIST: "true"
|
||||||
image: file-server:latest
|
image: file-server:latest
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
# Stage-5: Unknown-format discovery by Bayesian header clustering
|
# Stage-5: Unknown-format discovery by Bayesian header clustering
|
||||||
|
|
||||||
Status: **phases A and B implemented and calibrated** (`src/cluster.jl` +
|
Status: phases A and B implemented and calibrated (`src/cluster.jl` +
|
||||||
`src/catalog.jl`, `bin/cluster_calibrate.jl` + `bin/cluster_sweep.jl`, tests in
|
`src/catalog.jl`, `bin/cluster_calibrate.jl` + `bin/cluster_sweep.jl`, tests in
|
||||||
`test/runtests.jl`). Phase A (offline Gibbs) is calibrated; phase B's durable
|
`test/runtests.jl`). Phase A (offline Gibbs) is calibrated; phase B's durable
|
||||||
single-owner catalog, incremental sweep, and nomination writer are now built on
|
single-owner catalog, incremental sweep, and nomination writer are now built on
|
||||||
top of the `assign_file` scoring core. Product
|
top of the `assign_file` scoring core. This is the product of a design
|
||||||
of a design interview; captures the decisions and — as important — the
|
interview. It captures the decisions and, just as importantly, the assumptions
|
||||||
assumptions we *rejected* so they don't get silently reintroduced. §11 records
|
we *rejected*, so they don't get silently reintroduced. §11 records
|
||||||
what building it actually taught us, including three assumptions in this document
|
what building it actually taught us, including three assumptions in this document
|
||||||
that the data corrected.
|
that the data corrected.
|
||||||
|
|
||||||
## 1. Goal
|
## 1. Goal
|
||||||
|
|
||||||
Discover **recurring new file formats** hiding in the `binary/` bucket (the
|
Discover recurring new file formats hiding in the `binary/` bucket (the
|
||||||
`:unknown` sink from `classify.jl` → stage-3 triage). A genuinely novel format is
|
`:unknown` sink from `classify.jl` → stage-3 triage). A genuinely novel format is
|
||||||
a plausible proxy for a genuinely novel producing application, but we do **not**
|
a plausible proxy for a genuinely novel producing application, but we do not
|
||||||
try to identify producers directly (see §3). The output is a **growing catalog of
|
try to identify producers directly (see §3). The output is a **growing catalog of
|
||||||
discovered formats**, each with a magic-byte signature that can be promoted into
|
discovered formats**, each with a magic-byte signature that can be promoted into
|
||||||
the classifier's fast path.
|
the classifier's fast path.
|
||||||
@@ -23,42 +23,42 @@ Task shape (settled): **unsupervised clustering with an unknown number of
|
|||||||
clusters.** Not pairwise "same producer" scoring, not classification against a
|
clusters.** Not pairwise "same producer" scoring, not classification against a
|
||||||
fixed label set.
|
fixed label set.
|
||||||
|
|
||||||
## 2. Two phases — build (A) then run (B)
|
## 2. Two phases: build (A) then run (B)
|
||||||
|
|
||||||
**(A) Batch, offline — the science.** Cluster the accumulated pile from scratch.
|
**(A) Batch, offline, the science.** Cluster the accumulated pile from scratch.
|
||||||
Its job is *not* to be the catalog; it is to (i) prove the header-byte signal
|
Its job is *not* to be the catalog; it is to (i) prove the header-byte signal
|
||||||
actually separates formats, cross-checked against an NCD baseline (§8), and
|
actually separates formats, cross-checked against an NCD baseline (§8), and
|
||||||
(ii) **calibrate hyperparameters** against known formats (§7). Ship this first —
|
(ii) calibrate hyperparameters against known formats (§7). Ship this first,
|
||||||
it de-risks (B). If (A)'s clusters are garbage, (B)'s machinery is wasted.
|
because it de-risks (B). If (A)'s clusters are garbage, (B)'s machinery is wasted.
|
||||||
|
|
||||||
**(B) Online, live — the catalog.** The target deliverable. A persistent catalog
|
**(B) Online, live, the catalog.** The target deliverable. A persistent catalog
|
||||||
where each discovered format has a **durable, frozen ID** and stored sufficient
|
where each discovered format has a durable, frozen ID and stored sufficient
|
||||||
statistics. New unknown files are scored against existing clusters; only
|
statistics. New unknown files are scored against existing clusters; only
|
||||||
genuinely novel ones spawn a new entry. Clusters that accumulate enough evidence
|
genuinely novel ones spawn a new entry. Clusters that accumulate enough evidence
|
||||||
are **nominated for promotion** into the classifier (§6).
|
are nominated for promotion into the classifier (§6).
|
||||||
|
|
||||||
## 3. What we are and are NOT clustering
|
## 3. What we are and are NOT clustering
|
||||||
|
|
||||||
We cluster by **file format**, not by producer. The first-*n* header bytes are
|
We cluster by file format, not by producer. The first-*n* header bytes are
|
||||||
format-mandated and producer-invariant: every valid PNG shares the same magic
|
format-mandated and producer-invariant: every valid PNG shares the same magic
|
||||||
regardless of which program wrote it; a PDF's producer string lives deep inside
|
regardless of which program wrote it; a PDF's producer string lives deep inside
|
||||||
the file, not in the header. Producer identity, where recoverable at all, is
|
the file, not in the header. Producer identity, where recoverable at all, is
|
||||||
`exiftool`'s job (stage 2), not this stage's.
|
`exiftool`'s job (stage 2), not this stage's.
|
||||||
|
|
||||||
Corollary already visible in `../training_set`: extension labels are **not**
|
Corollary already visible in `../training_set`: extension labels are not
|
||||||
header-format labels. `docx` *is* a PK zip; `so`/`o`/`elf`/`out` are all ELF.
|
header-format labels. `docx` *is* a PK zip; `so`/`o`/`elf`/`out` are all ELF.
|
||||||
Merging those is **correct**, not error (see §7).
|
Merging those is correct, not error (see §7).
|
||||||
|
|
||||||
## 4. Model: DP mixture of per-position categoricals
|
## 4. Model: DP mixture of per-position categoricals
|
||||||
|
|
||||||
A cluster is a **product of independent per-position categorical distributions**
|
A cluster is a product of independent per-position categorical distributions
|
||||||
over the first *n* header bytes. Position *i* carries a distribution `θᵢ` over a
|
over the first *n* header bytes. Position *i* carries a distribution `θᵢ` over a
|
||||||
**257-symbol alphabet**: byte values `0–255`, plus symbol `256 = "past EOF"`.
|
**257-symbol alphabet**: byte values `0–255`, plus symbol `256 = "past EOF"`.
|
||||||
|
|
||||||
- Invariant positions (magic bytes) learn a spiked `θᵢ`; variable positions
|
- Invariant positions (magic bytes) learn a spiked `θᵢ`; variable positions
|
||||||
(lengths, timestamps) learn a flat one. A cluster's signature = the vector of
|
(lengths, timestamps) learn a flat one. A cluster's signature = the vector of
|
||||||
modal symbols + per-position peakedness. That signature **is a magic-number
|
modal symbols + per-position peakedness. That signature **is a magic-number
|
||||||
template** — this is the entire reason for the categorical choice.
|
template**, which is the entire reason for the categorical choice.
|
||||||
- `257` alphabet handles short files honestly: a format that is always 20 bytes
|
- `257` alphabet handles short files honestly: a format that is always 20 bytes
|
||||||
produces a spiked "past-EOF" at positions 20–31, which is real, discriminative
|
produces a spiked "past-EOF" at positions 20–31, which is real, discriminative
|
||||||
signal. No zero-padding (would collide `0x00` padding with real `0x00` bytes).
|
signal. No zero-padding (would collide `0x00` padding with real `0x00` bytes).
|
||||||
@@ -69,13 +69,13 @@ process (CRP)** over cluster assignments → unknown *k* falls out natively.
|
|||||||
**Why categorical, not Euclidean.** Bytes are categorical, not ordinal: `0x89`
|
**Why categorical, not Euclidean.** Bytes are categorical, not ordinal: `0x89`
|
||||||
and `0x88` are not "close," `0x00` and `0xFF` are not "far." k-means / Gaussian
|
and `0x88` are not "close," `0x00` and `0xFF` are not "far." k-means / Gaussian
|
||||||
mixtures over scaled bytes assert a metric that does not exist in header space.
|
mixtures over scaled bytes assert a metric that does not exist in header space.
|
||||||
**Do not reuse `model.jl`'s `[0,1]` byte scaling here** — that scaling is correct
|
**Do not reuse `model.jl`'s `[0,1]` byte scaling here.** That scaling is correct
|
||||||
for the Lux net and wrong for this model. We need the raw `0–255` byte as a
|
for the Lux net and wrong for this model. We need the raw `0–255` byte as a
|
||||||
categorical index.
|
categorical index.
|
||||||
|
|
||||||
### 4a. Background component (high-entropy handling)
|
### 4a. Background component (high-entropy handling)
|
||||||
|
|
||||||
Add a fixed, **non-adaptive uniform component** (each position uniform over 257)
|
Add a fixed, non-adaptive uniform component (each position uniform over 257)
|
||||||
as the "junk drawer." Compressed/encrypted/structureless blobs are ~uniform after
|
as the "junk drawer." Compressed/encrypted/structureless blobs are ~uniform after
|
||||||
any magic and would otherwise either (i) mint a singleton per file or (ii)
|
any magic and would otherwise either (i) mint a singleton per file or (ii)
|
||||||
collapse into one flat cluster that then matches everything. The background
|
collapse into one flat cluster that then matches everything. The background
|
||||||
@@ -84,73 +84,73 @@ absorbs them cleanly.
|
|||||||
Two populations, to be precise:
|
Two populations, to be precise:
|
||||||
- **Structured prefix + random tail** (gzip `1f 8b`, PK zip, zstd, most encrypted
|
- **Structured prefix + random tail** (gzip `1f 8b`, PK zip, zstd, most encrypted
|
||||||
*containers*): peaked at positions 0–3, flat after. These form **real clusters
|
*containers*): peaked at positions 0–3, flat after. These form **real clusters
|
||||||
for free** — genuine discoveries, no special handling.
|
for free**: genuine discoveries, no special handling.
|
||||||
- **Uniform from byte 0** (raw encrypted streams, key material): nothing in the
|
- **Uniform from byte 0** (raw encrypted streams, key material): nothing in the
|
||||||
header to cluster on → absorbed by background.
|
header to cluster on → absorbed by background.
|
||||||
|
|
||||||
The background is **never promotable**. But it is **not a silent sink**: its
|
The background is never promotable. But it is not a silent sink: its
|
||||||
size / growth / entropy histogram is surfaced as a first-class signal ("12% of
|
size / growth / entropy histogram is surfaced as a first-class signal ("12% of
|
||||||
this week's unknowns are structureless"). If sub-clustering the structureless
|
this week's unknowns are structureless"). If sub-clustering the structureless
|
||||||
residue ever matters, that needs a *different* feature (byte histogram / entropy),
|
residue ever matters, that needs a *different* feature (byte histogram / entropy),
|
||||||
a separate v3 model — header bytes genuinely cannot do it.
|
a separate v3 model. Header bytes genuinely cannot do it.
|
||||||
|
|
||||||
### 4b. Feature window
|
### 4b. Feature window
|
||||||
|
|
||||||
**Front-only, `n = 32`** (config knob; try 64 if under-resolved). Magic lives at
|
**Front-only, `n = 32`** (config knob; try 64 if under-resolved). Magic lives at
|
||||||
offset 0. Tail window **deferred to v2** — a minority of formats have trailers
|
offset 0. Tail window deferred to v2: a minority of formats have trailers
|
||||||
(ZIP EOCD, ID3v1, PDF `%%EOF`); add as an independent *second block* of positions
|
(ZIP EOCD, ID3v1, PDF `%%EOF`); add as an independent *second block* of positions
|
||||||
only if real trailer-formats show up in the residue.
|
only if real trailer-formats show up in the residue.
|
||||||
|
|
||||||
**Known blind spot: tar.** `ustar` magic is at **offset 257**, outside the
|
**Known blind spot: tar.** `ustar` magic is at offset 257, outside the window,
|
||||||
window, so all 100 training tars scatter to background. Accepted for v1 — tar is
|
so all 100 training tars scatter to background. Accepted for v1, since tar is
|
||||||
already a *known* format, so discovery doesn't need it. General lesson: a minority
|
already a *known* format and discovery doesn't need it. General lesson: a
|
||||||
of formats put magic at a fixed deeper offset; the fix (if ever needed) is a
|
minority of formats put magic at a fixed deeper offset; the fix (if ever needed)
|
||||||
**sparse probe window** at that offset (e.g. bytes 257–262 as a third block), not
|
is a sparse probe window at that offset (e.g. bytes 257–262 as a third block),
|
||||||
densely modeling 257 front bytes — that would 8× every cluster's `n×257`
|
rather than densely modeling 257 front bytes, which would 8× every cluster's
|
||||||
sufficient-stat table to catch one format.
|
`n×257` sufficient-stat table to catch one format.
|
||||||
|
|
||||||
## 5. Inference: different mode per phase (resolves the Bayesian-vs-catalog tension)
|
## 5. Inference: different mode per phase (resolves the Bayesian-vs-catalog tension)
|
||||||
|
|
||||||
A sampler yields a *posterior over partitions*; a catalog needs *one partition
|
A sampler yields a *posterior over partitions*; a catalog needs *one partition
|
||||||
with durable IDs*. Two MCMC gotchas: **label switching** (cluster #3 is not a
|
with durable IDs*. Two MCMC gotchas: label switching (cluster #3 is not a
|
||||||
stable identity across iterations/runs) and **distribution-not-answer** (1000
|
stable identity across iterations/runs) and distribution-not-answer (1000
|
||||||
partitions, not one). We sidestep both by using two inference modes:
|
partitions, not one). We sidestep both by using two inference modes:
|
||||||
|
|
||||||
- **Phase (A), offline:** full **collapsed Gibbs** sampler over the
|
- **Phase (A), offline:** full collapsed Gibbs sampler over the
|
||||||
Dirichlet-Categorical (conjugacy → ~100 lines, no continuous approximation,
|
Dirichlet-Categorical (conjugacy → ~100 lines, no continuous approximation,
|
||||||
unknown *k* native). Used to validate signal, tune `α` + Dirichlet strength,
|
unknown *k* native). Used to validate signal, tune `α` + Dirichlet strength,
|
||||||
and seed the initial catalog (summarize to a point partition **once**, via a
|
and seed the initial catalog (summarize to a point partition once, via a
|
||||||
VI/Binder loss over the posterior similarity matrix — tolerated because it is
|
VI/Binder loss over the posterior similarity matrix, tolerated because it is
|
||||||
offline, never in the hot path).
|
offline, never in the hot path).
|
||||||
- **Phase (B), live:** **deterministic sequential CRP-predictive assignment.**
|
- **Phase (B), live:** deterministic sequential CRP-predictive assignment.
|
||||||
Each catalog cluster stores per-position 257-count vectors (sufficient stats).
|
Each catalog cluster stores per-position 257-count vectors (sufficient stats).
|
||||||
A new file's CRP predictive probability of joining each existing cluster vs.
|
A new file's CRP predictive probability of joining each existing cluster vs.
|
||||||
the background vs. spawning a new cluster is computed; assign to the argmax.
|
the background vs. spawning a new cluster is computed; assign to the argmax.
|
||||||
A new cluster is minted only if the new-cluster evidence beats the background
|
A new cluster is minted only if the new-cluster evidence beats the background
|
||||||
by a margin. **IDs are frozen at birth → no label switching.** This is exactly
|
by a margin. IDs are frozen at birth → no label switching. This is exactly
|
||||||
the Gibbs predictive rule with existing assignments held fixed — same math, not
|
the Gibbs predictive rule with existing assignments held fixed: the same math,
|
||||||
an ad-hoc hack.
|
not an ad-hoc hack.
|
||||||
- **Periodic compaction, offline:** re-run Gibbs seeded from the current catalog
|
- **Periodic compaction, offline:** re-run Gibbs seeded from the current catalog
|
||||||
to merge drifted clusters / split bloated ones.
|
to merge drifted clusters / split bloated ones.
|
||||||
|
|
||||||
## 6. Promotion (closing the loop to the classifier)
|
## 6. Promotion (closing the loop to the classifier)
|
||||||
|
|
||||||
**Layered known-check at ingest** becomes:
|
**Layered known-check at ingest** becomes:
|
||||||
1. Match against **promoted signatures** (exact, fast) — runs *before* the net.
|
1. Match against promoted signatures (exact, fast), which runs *before* the net.
|
||||||
2. Else the Lux `:known` / `:unknown` classifier.
|
2. Else the Lux `:known` / `:unknown` classifier.
|
||||||
3. Else route to `binary/` for this stage.
|
3. Else route to `binary/` for this stage.
|
||||||
|
|
||||||
**Promotion = append a magic-byte signature to a registry.** A cluster's spiked
|
**Promotion = append a magic-byte signature to a registry.** A cluster's spiked
|
||||||
positions (posterior max-prob `> ~0.9`) become required bytes; flat positions
|
positions (posterior max-prob `> ~0.9`) become required bytes; flat positions
|
||||||
become wildcards — a libmagic-style signature. This is a **data change, not a
|
become wildcards, giving a libmagic-style signature. This is a **data change, not a
|
||||||
retrain**; interpretable, auditable, reversible. Retraining the Lux net is a
|
retrain**; interpretable, auditable, reversible. Retraining the Lux net is a
|
||||||
separate, *optional periodic* activity using accumulated signature-labeled files,
|
separate, *optional periodic* activity using accumulated signature-labeled files,
|
||||||
never the promotion mechanism itself.
|
never the promotion mechanism itself.
|
||||||
|
|
||||||
**Nominate automatically, activate by hand.** A cluster crossing thresholds —
|
**Nominate automatically, activate by hand.** A cluster crossing the thresholds
|
||||||
`≥ N` members (start `N ≈ 20–50`, loose dial since a human is the backstop) **and**
|
(`≥ N` members, starting at `N ≈ 20–50`, a loose dial since a human is the
|
||||||
`≥ ~3` magic positions **and** not the background — is written to a `nominated/`
|
backstop; `≥ ~3` magic positions; and not the background) is written to a
|
||||||
registry with its signature, member count, and example files. A human glance
|
`nominated/` registry with its signature, member count, and example files. A human glance
|
||||||
promotes it into the active set. Human gate guards the one hard-to-reverse action
|
promotes it into the active set. Human gate guards the one hard-to-reverse action
|
||||||
(redefining "known"); everything upstream stays automatic.
|
(redefining "known"); everything upstream stays automatic.
|
||||||
|
|
||||||
@@ -159,52 +159,52 @@ promotes it into the active set. Human gate guards the one hard-to-reverse actio
|
|||||||
Do not pick priors blind. We have ground truth: `../training_set` (100 each of
|
Do not pick priors blind. We have ground truth: `../training_set` (100 each of
|
||||||
tgz/tar/pdf/docx, 98 zip, 93 jpg, ELF family) and the `data/done` corpus.
|
tgz/tar/pdf/docx, 98 zip, 93 jpg, ELF family) and the `data/done` corpus.
|
||||||
|
|
||||||
1. Run **labeled known files** through the exact clustering pipeline.
|
1. Run labeled known files through the exact clustering pipeline.
|
||||||
2. Ground truth = **magic-collapsed classes**, *not* extensions:
|
2. Ground truth = magic-collapsed classes, *not* extensions:
|
||||||
`{gzip (tgz), PKzip (docx≡zip), ELF (so/o/elf/out/x86_64), JPEG, PDF, tar}`.
|
`{gzip (tgz), PKzip (docx≡zip), ELF (so/o/elf/out/x86_64), JPEG, PDF, tar}`.
|
||||||
Merging docx+zip and the ELF family is the **correct** answer — scoring
|
Merging docx+zip and the ELF family is the correct answer; scoring
|
||||||
against raw extensions would penalize correctness and mistune `α`.
|
against raw extensions would penalize correctness and mistune `α`.
|
||||||
3. Measure recovered-vs-truth agreement with **Adjusted Rand Index / V-measure**.
|
3. Measure recovered-vs-truth agreement with Adjusted Rand Index / V-measure.
|
||||||
4. **Grid-tune `α` and the Dirichlet pseudocount to maximize agreement** — the
|
4. **Grid-tune `α` and the Dirichlet pseudocount to maximize agreement**, which
|
||||||
settings at which the machine rediscovers formats we already know.
|
finds the settings at which the machine rediscovers formats we already know.
|
||||||
5. Freeze, deploy on the `:unknown` pile.
|
5. Freeze, deploy on the `:unknown` pile.
|
||||||
|
|
||||||
Splitting docx from zip is a **later tier**: the discriminating info
|
Splitting docx from zip is a later tier: the discriminating info
|
||||||
(central-directory filenames like `word/document.xml`) sits at a *variable
|
(central-directory filenames like `word/document.xml`) sits at a *variable
|
||||||
offset*, not a fixed position — a different feature problem, deferred.
|
offset*, not a fixed position. That is a different feature problem, deferred.
|
||||||
|
|
||||||
## 8. Julia package surface
|
## 8. Julia package surface
|
||||||
|
|
||||||
- **Hand-rolled collapsed Gibbs** over Dirichlet-Categorical — recommended. The
|
- **Hand-rolled collapsed Gibbs** over Dirichlet-Categorical. Recommended: the
|
||||||
conjugacy makes it short/fast; we own the online + promotion logic; no library
|
conjugacy makes it short/fast; we own the online + promotion logic; no library
|
||||||
impedance. `Distributions.jl` for `Dirichlet`/`Categorical` primitives.
|
impedance. `Distributions.jl` for `Dirichlet`/`Categorical` primitives.
|
||||||
- **`CodecZlib`** for the **NCD (Normalized Compression Distance)** baseline —
|
- **`CodecZlib`** for the NCD (Normalized Compression Distance) baseline:
|
||||||
model-free gzip-similarity clustering. Excellent at format grouping and a great
|
model-free gzip-similarity clustering. Excellent at format grouping and a great
|
||||||
step-(A) sanity check, but O(N²), non-generative (no signature, no online
|
step-(A) sanity check, but O(N²), non-generative (no signature, no online
|
||||||
scoring, no promotion) → **baseline only, cannot be the catalog.**
|
scoring, no promotion) → baseline only, cannot be the catalog.
|
||||||
- **`Clustering.jl`** — `randindex` / `vmeasure` for the §7 calibration metric,
|
- **`Clustering.jl`** for `randindex` / `vmeasure`, the §7 calibration metric,
|
||||||
plus a throwaway k-modes-ish baseline. **Not** the real model (its k-means is
|
plus a throwaway k-modes-ish baseline. Not the real model (its k-means is
|
||||||
the Euclidean trap of §4).
|
the Euclidean trap of §4).
|
||||||
- **`Turing.jl`** — considered and rejected: discrete assignment latents + DP are
|
- **`Turing.jl`**, considered and rejected: discrete assignment latents + DP are
|
||||||
awkward, and we'd still hand-roll the online path. Overkill.
|
awkward, and we'd still hand-roll the online path. Overkill.
|
||||||
|
|
||||||
## 9. Architecture: single-owner batch stage, NOT inline inference
|
## 9. Architecture: single-owner batch stage, NOT inline inference
|
||||||
|
|
||||||
The classifier is stateless, immutable, shared read-only across worker threads
|
The classifier is stateless, immutable, shared read-only across worker threads
|
||||||
(see `classify.jl`). **The catalog is the opposite: mutable, learned, shared** —
|
(see `classify.jl`). The catalog is the opposite: mutable, learned, shared, since
|
||||||
every assigned file updates a cluster's counts. It therefore must **not** copy the
|
every assigned file updates a cluster's counts. It therefore must not copy the
|
||||||
classifier's concurrency model (concurrent workers → lock contention, torn reads
|
classifier's concurrency model (concurrent workers → lock contention, torn reads
|
||||||
of sufficient stats, CRP assignment against stale mass).
|
of sufficient stats, CRP assignment against stale mass).
|
||||||
|
|
||||||
Because **promotion is human-gated, nothing here is latency-sensitive.** So:
|
Because promotion is human-gated, nothing here is latency-sensitive. So:
|
||||||
|
|
||||||
- Workers stay stateless — they deposit `:unknown` files into `binary/` exactly as
|
- Workers stay stateless. They deposit `:unknown` files into `binary/` exactly as
|
||||||
today. **No catalog access on the hot path.**
|
today. No catalog access on the hot path.
|
||||||
- A **separate stage-5 process** (periodic / cron, single-threaded) owns the
|
- A separate stage-5 process (periodic / cron, single-threaded) owns the
|
||||||
catalog **exclusively**: sweeps newly-arrived `binary/` files, runs sequential
|
catalog exclusively: sweeps newly-arrived `binary/` files, runs sequential
|
||||||
CRP-predictive assignment, updates sufficient stats, writes nominations.
|
CRP-predictive assignment, updates sufficient stats, writes nominations.
|
||||||
**One writer, zero locks, no cross-thread shared mutable state.**
|
**One writer, zero locks, no cross-thread shared mutable state.**
|
||||||
- The catalog is a **durable file** mutated by one process — reuse the stage-2
|
- The catalog is a durable file mutated by one process, so reuse the stage-2
|
||||||
**sidecar-first durable-commit** discipline (`commit_enriched!`: temp write →
|
**sidecar-first durable-commit** discipline (`commit_enriched!`: temp write →
|
||||||
fsync bytes → rename → fsync dir) so a crash can't corrupt it or lose a rename.
|
fsync bytes → rename → fsync dir) so a crash can't corrupt it or lose a rename.
|
||||||
|
|
||||||
@@ -216,8 +216,8 @@ This slots in as a batch stage, matching how stages 2/3/4 already work. New
|
|||||||
## 10. Concrete test assertions (write these first)
|
## 10. Concrete test assertions (write these first)
|
||||||
|
|
||||||
1. **Discovers nothing from noise.** Current `data/binary` = 20 small random
|
1. **Discovers nothing from noise.** Current `data/binary` = 20 small random
|
||||||
blobs + 1 giant PDF. Correct output: PDF is a singleton that **never promotes**
|
blobs + 1 giant PDF. Correct output: PDF is a singleton that never promotes
|
||||||
(N=1), 20 blobs absorbed by background, **zero promoted clusters.** Any
|
(N=1), 20 blobs absorbed by background, zero promoted clusters. Any
|
||||||
promoted cluster from this pile = broken.
|
promoted cluster from this pile = broken.
|
||||||
2. **Recovers known formats.** On a `../training_set` sample, calibrated settings
|
2. **Recovers known formats.** On a `../training_set` sample, calibrated settings
|
||||||
cluster into the ~6 magic-collapsed classes with high ARI (docx+zip merged,
|
cluster into the ~6 magic-collapsed classes with high ARI (docx+zip merged,
|
||||||
@@ -228,23 +228,23 @@ This slots in as a batch stage, matching how stages 2/3/4 already work. New
|
|||||||
|
|
||||||
## 11. Implementation status & calibration results (v1)
|
## 11. Implementation status & calibration results (v1)
|
||||||
|
|
||||||
**Shipped.** `src/cluster.jl` — feature extraction (`header_symbols`, 257-symbol
|
**Shipped.** `src/cluster.jl` holds feature extraction (`header_symbols`, 257-symbol
|
||||||
alphabet), collapsed Gibbs (`gibbs_cluster`, phase A), the sequential
|
alphabet), collapsed Gibbs (`gibbs_cluster`, phase A), the sequential
|
||||||
CRP-predictive rule (`assign_file`, phase B core), signatures/promotion
|
CRP-predictive rule (`assign_file`, phase B core), signatures/promotion
|
||||||
(`signature`, `is_promotable`), and calibration metrics (`adjusted_rand_index`,
|
(`signature`, `is_promotable`), and calibration metrics (`adjusted_rand_index`,
|
||||||
`v_measure`). All base-Julia — a base-only Lanczos `loggamma` keeps the
|
`v_measure`). All base-Julia: a base-only Lanczos `loggamma` keeps the
|
||||||
Dirichlet-multinomial marginal dependency-free (no Manifest churn). Config knobs
|
Dirichlet-multinomial marginal dependency-free (no Manifest churn). Config knobs
|
||||||
`FS_CLUSTER_*` (§9) added. `bin/cluster_calibrate.jl` runs the §7 grid and the §8
|
`FS_CLUSTER_*` (§9) added. `bin/cluster_calibrate.jl` runs the §7 grid and the §8
|
||||||
NCD baseline. Concrete §10 assertions are in the test suite (hermetic synthetic
|
NCD baseline. Concrete §10 assertions are in the test suite (hermetic synthetic
|
||||||
corpora, so they need neither `../training_set` nor gzip).
|
corpora, so they need neither `../training_set` nor gzip).
|
||||||
|
|
||||||
**Calibrated defaults** (grid over the 700-file `training_set`, ranked by ARI
|
**Calibrated defaults** (grid over the 700-file `training_set`, ranked by ARI
|
||||||
excluding tar): **n=32, α=1.0, β=0.1, bg_mass=5.0** → ARI **0.77** (0.885 excl.
|
excluding tar): n=32, α=1.0, β=0.1, bg_mass=5.0 → ARI 0.77 (0.885 excl.
|
||||||
tar), V-measure 0.83, homogeneity 0.87. Clusters are clean and promotable:
|
tar), V-measure 0.83, homogeneity 0.87. Clusters are clean and promotable:
|
||||||
`pkzip:197` (docx+zip correctly merged, §7.2 ✓), `gzip:100`, `jpeg`, and several
|
`pkzip:197` (docx+zip correctly merged, §7.2 ✓), `gzip:100`, `jpeg`, and several
|
||||||
`pdf` clusters all self-nominate. The **NCD baseline agrees** (§10.3): on a
|
`pdf` clusters all self-nominate. The NCD baseline agrees (§10.3): on a
|
||||||
150-file subsample, NCD 1-NN label purity 0.90 vs. the model's same-cluster
|
150-file subsample, NCD 1-NN label purity 0.90 vs. the model's same-cluster
|
||||||
purity 0.987 — the generative header model separates formats at least as well as
|
purity 0.987. The generative header model separates formats at least as well as
|
||||||
model-free gzip similarity.
|
model-free gzip similarity.
|
||||||
|
|
||||||
### Three assumptions the data corrected
|
### Three assumptions the data corrected
|
||||||
@@ -253,34 +253,34 @@ model-free gzip similarity.
|
|||||||
tar's `ustar`-at-257 magic is out of window so tars scatter to background. But
|
tar's `ustar`-at-257 magic is out of window so tars scatter to background. But
|
||||||
98/100 tars in the corpus are Hex/Elixir package tarballs whose *first
|
98/100 tars in the corpus are Hex/Elixir package tarballs whose *first
|
||||||
archived file is named `VERSION`* → a constant, strongly-peaked `VERSION\0`
|
archived file is named `VERSION`* → a constant, strongly-peaked `VERSION\0`
|
||||||
prefix at offset 0. They do form a peaked cluster — but it **merges with ELF**,
|
prefix at offset 0. They do form a peaked cluster, but it merges with ELF,
|
||||||
because ELF's ident padding and tar's name-field zero-padding give the two a
|
because ELF's ident padding and tar's name-field zero-padding give the two a
|
||||||
long shared run of `0x00` in bytes 5–31; they differ in only ~3 magic bytes,
|
long shared run of `0x00` in bytes 5–31; they differ in only ~3 magic bytes,
|
||||||
and 32 equally-weighted positions let ~20 shared zeros outvote 3 real ones. No
|
and 32 equally-weighted positions let ~20 shared zeros outvote 3 real ones. No
|
||||||
β both separates ELF/tar and keeps the other formats whole. The honest v1
|
β both separates ELF/tar and keeps the other formats whole. The honest v1
|
||||||
position: this is the *same* "tar is hard" reality §4b flagged, just wearing a
|
position: this is the *same* "tar is hard" reality §4b flagged, just wearing a
|
||||||
different mask. **Fix (v2):** weight positions by inverse entropy so a
|
different mask. Fix (v2): weight positions by inverse entropy so a
|
||||||
low-information shared-zero run stops dominating a few high-information magic
|
low-information shared-zero run stops dominating a few high-information magic
|
||||||
bytes — this generalizes beyond tar and is the highest-value next lever.
|
bytes. This generalizes beyond tar and is the highest-value next lever.
|
||||||
|
|
||||||
2. **You cannot cold-start every point in the background.** A natural reading of
|
2. **You cannot cold-start every point in the background.** A natural reading of
|
||||||
§4a/§5 is "everything starts in the junk drawer, real clusters condense out."
|
§4a/§5 is "everything starts in the junk drawer, real clusters condense out."
|
||||||
That **deadlocks**: at a format's first file a fresh cluster and the background
|
That deadlocks: at a format's first file a fresh cluster and the background
|
||||||
are *both* uniform, so with the `bg_mass ≥ α` that §4a needs for absorption,
|
are *both* uniform, so with the `bg_mass ≥ α` that §4a needs for absorption,
|
||||||
the background always wins and no cluster is ever seeded. Fix: **initialize
|
the background always wins and no cluster is ever seeded. Fix: **initialize
|
||||||
every file in its own singleton**; same-format singletons merge and snowball,
|
every file in its own singleton**; same-format singletons merge and snowball,
|
||||||
while a lone random-blob singleton dissolves on resample and is reclaimed by
|
while a lone random-blob singleton dissolves on resample and is reclaimed by
|
||||||
the (stickier) background. Absorption still works — just not as the *initial*
|
the (stickier) background. Absorption still works, just not as the *initial*
|
||||||
state.
|
state.
|
||||||
|
|
||||||
3. **Two pieces of math that look optional but aren't.** (a) Signature peakedness
|
3. **Two pieces of math that look optional but aren't.** (a) Signature peakedness
|
||||||
is a **Bernoulli** question ("is this position fixed to byte v?"), so it uses a
|
is a Bernoulli question ("is this position fixed to byte v?"), so it uses a
|
||||||
2-way posterior `(count+β)/(members+2β)`, **not** the 257-way mixture
|
2-way posterior `(count+β)/(members+2β)`, not the 257-way mixture
|
||||||
predictive — the alphabet-wide denominator drags even a unanimous position
|
predictive, because the alphabet-wide denominator drags even a unanimous position
|
||||||
below 0.9 once β<1, which would make promotion *impossible*. (b) Ranking Gibbs
|
below 0.9 once β<1, which would make promotion *impossible*. (b) Ranking Gibbs
|
||||||
restarts needs the **collapsed Dirichlet-multinomial marginal** (with its
|
restarts needs the collapsed Dirichlet-multinomial marginal (with its
|
||||||
`loggamma` normalizer / Occam penalty); a plain product-of-predictives score
|
`loggamma` normalizer / Occam penalty); a plain product-of-predictives score
|
||||||
omits the penalty and actively **rewards merging** everything into one blob
|
omits the penalty and actively rewards merging everything into one blob
|
||||||
(observed, then fixed).
|
(observed, then fixed).
|
||||||
|
|
||||||
### Known v1 limitations (accepted)
|
### Known v1 limitations (accepted)
|
||||||
@@ -289,23 +289,23 @@ model-free gzip similarity.
|
|||||||
version byte). This costs completeness/ARI but not the mission: each sub-cluster
|
version byte). This costs completeness/ARI but not the mission: each sub-cluster
|
||||||
still carries valid magic and promotes independently, and a human dedupes
|
still carries valid magic and promotes independently, and a human dedupes
|
||||||
overlapping `%PDF-1.x` nominations at the gate.
|
overlapping `%PDF-1.x` nominations at the gate.
|
||||||
- The point partition is the **best of N Gibbs restarts by marginal likelihood**,
|
- The point partition is the best of N Gibbs restarts by marginal likelihood,
|
||||||
a MAP-style stand-in for the VI/Binder posterior summary §5 defers — adequate
|
a MAP-style stand-in for the VI/Binder posterior summary §5 defers. Adequate,
|
||||||
because the formats are strongly separated; revisit if compaction (§5) needs it.
|
because the formats are strongly separated; revisit if compaction (§5) needs it.
|
||||||
- Phase B's **live single-owner batch process** (§9) and the durable catalog file
|
- Phase B's live single-owner batch process (§9) and the durable catalog file
|
||||||
are implemented in `src/catalog.jl` (the `Catalog` durable state, the
|
are implemented in `src/catalog.jl` (the `Catalog` durable state, the
|
||||||
incremental `catalog_sweep!`, the offline `compact!` seed/recompaction, and
|
incremental `catalog_sweep!`, the offline `compact!` seed/recompaction, and
|
||||||
`write_nominations!`), driven by `bin/cluster_sweep.jl` (cron/periodic; the
|
`write_nominations!`), driven by `bin/cluster_sweep.jl` (cron/periodic; the
|
||||||
first run auto-compacts to seed, subsequent runs sweep incrementally). The
|
first run auto-compacts to seed, subsequent runs sweep incrementally). The
|
||||||
catalog is persisted with the stage-2 sidecar-first temp→fsync→rename→fsync-dir
|
catalog is persisted with the stage-2 sidecar-first temp→fsync→rename→fsync-dir
|
||||||
discipline. As §5B predicts, under the calibrated `bg_mass > α` the live sweep
|
discipline. As §5B predicts, under the calibrated `bg_mass > α` the live sweep
|
||||||
never mints single-file clusters — new formats are discovered by the offline
|
never mints single-file clusters: new formats are discovered by the offline
|
||||||
`compact!` re-clustering the background residue, not by the live path.
|
`compact!` re-clustering the background residue, not by the live path.
|
||||||
|
|
||||||
## Open items (deferred, intentionally)
|
## Open items (deferred, intentionally)
|
||||||
|
|
||||||
- **v2, now top priority: inverse-entropy position weighting** (unblocks ELF/tar
|
- **v2, now top priority: inverse-entropy position weighting** (unblocks ELF/tar
|
||||||
and any format pair that shares a long constant run — see §11).
|
and any format pair that shares a long constant run; see §11).
|
||||||
|
|
||||||
- v2: tail-window block; sparse deep-offset probe (tar-class).
|
- v2: tail-window block; sparse deep-offset probe (tar-class).
|
||||||
- v3: sub-clustering structureless high-entropy residue (needs entropy/histogram
|
- v3: sub-clustering structureless high-entropy residue (needs entropy/histogram
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export run
|
|||||||
|
|
||||||
# When stderr is a live terminal Julia flushes each write, but when it's
|
# When stderr is a live terminal Julia flushes each write, but when it's
|
||||||
# redirected to a file or pipe (a log file, `tee`, journald, a container log
|
# redirected to a file or pipe (a log file, `tee`, journald, a container log
|
||||||
# driver) Julia block-buffers it — so a long-running server's logs sit unseen in
|
# driver) Julia block-buffers it, so a long-running server's logs sit unseen in
|
||||||
# the buffer until it fills or the process exits, making it look like nothing is
|
# the buffer until it fills or the process exits, making it look like nothing is
|
||||||
# happening. This wrapper delegates to a normal logger and flushes after every
|
# happening. This wrapper delegates to a normal logger and flushes after every
|
||||||
# message so output appears immediately wherever stderr is pointed.
|
# message so output appears immediately wherever stderr is pointed.
|
||||||
@@ -94,7 +94,7 @@ function run(; overrides...)
|
|||||||
|
|
||||||
# github-linguist powers stage-4 *programming*-language detection, but it's
|
# github-linguist powers stage-4 *programming*-language detection, but it's
|
||||||
# best-effort (natural-language enrichment stands on its own), so a missing
|
# best-effort (natural-language enrichment stands on its own), so a missing
|
||||||
# binary is a warning, not a fatal error — per-file lookups degrade to none.
|
# binary is a warning, not a fatal error; per-file lookups degrade to none.
|
||||||
linguist_available() || @warn "github-linguist not found on PATH; stage-4 text files will have no programming language (install it to enable)"
|
linguist_available() || @warn "github-linguist not found on PATH; stage-4 text files will have no programming language (install it to enable)"
|
||||||
|
|
||||||
queue = ChannelQueue(cfg.queue_capacity)
|
queue = ChannelQueue(cfg.queue_capacity)
|
||||||
@@ -122,7 +122,7 @@ function run(; overrides...)
|
|||||||
# Zero the counters here, not at module load: `since` should mean "serving
|
# Zero the counters here, not at module load: `since` should mean "serving
|
||||||
# since", so a scrape's totals cover the run, not the minutes spent loading
|
# since", so a scrape's totals cover the run, not the minutes spent loading
|
||||||
# the classifier. It must also come *before* the pools start, since recovery
|
# the classifier. It must also come *before* the pools start, since recovery
|
||||||
# below runs against live workers — the replayed files are real work and
|
# below runs against live workers. The replayed files are real work and
|
||||||
# belong in the totals, but only from this point on.
|
# belong in the totals, but only from this point on.
|
||||||
reset_metrics!()
|
reset_metrics!()
|
||||||
|
|
||||||
@@ -156,7 +156,7 @@ function run(; overrides...)
|
|||||||
# Everything re-enters at stage 1 and replays: the queues are in-process, so
|
# Everything re-enters at stage 1 and replays: the queues are in-process, so
|
||||||
# a crash loses the only record of how far each file had got. Safe, because
|
# a crash loses the only record of how far each file had got. Safe, because
|
||||||
# every stage is a pure function of the file's bytes and every commit is
|
# every stage is a pure function of the file's bytes and every commit is
|
||||||
# idempotent — see the header of src/worker.jl for the trade and the fix.
|
# idempotent; see the header of src/worker.jl for the trade and the fix.
|
||||||
recovered = recover_dir!(cfg.spool_dir, queue)
|
recovered = recover_dir!(cfg.spool_dir, queue)
|
||||||
recovered > 0 && @info "recovered leftover files; replaying from stage 1" recovered=recovered
|
recovered > 0 && @info "recovered leftover files; replaying from stage 1" recovered=recovered
|
||||||
|
|
||||||
@@ -171,7 +171,7 @@ function run(; overrides...)
|
|||||||
# buffered jobs, then exit. Called from two places:
|
# buffered jobs, then exit. Called from two places:
|
||||||
# * the `finally` below, for SIGINT (Ctrl-C) and normal return, and
|
# * the `finally` below, for SIGINT (Ctrl-C) and normal return, and
|
||||||
# * an `atexit` hook, for SIGTERM (systemd/Docker/k8s `stop`).
|
# * an `atexit` hook, for SIGTERM (systemd/Docker/k8s `stop`).
|
||||||
# We can't intercept SIGTERM directly — Julia blocks it on worker threads and
|
# We can't intercept SIGTERM directly: Julia blocks it on worker threads and
|
||||||
# handles it in its own runtime, so a user signal() handler never fires. But
|
# handles it in its own runtime, so a user signal() handler never fires. But
|
||||||
# Julia's SIGTERM path runs `atexit` hooks, which gives us a reliable seam.
|
# Julia's SIGTERM path runs `atexit` hooks, which gives us a reliable seam.
|
||||||
drained = Threads.Atomic{Bool}(false)
|
drained = Threads.Atomic{Bool}(false)
|
||||||
@@ -180,11 +180,11 @@ function run(; overrides...)
|
|||||||
@info "draining queues and stopping workers"
|
@info "draining queues and stopping workers"
|
||||||
terminate() # 1. stop accepting new HTTP requests
|
terminate() # 1. stop accepting new HTTP requests
|
||||||
close!(queue) # 2. no new classify jobs; stage-1 drains buffered
|
close!(queue) # 2. no new classify jobs; stage-1 drains buffered
|
||||||
foreach(wait, workers) # 3. wait out stage-1 — the ONLY producer of BOTH the
|
foreach(wait, workers) # 3. wait out stage-1, the ONLY producer of BOTH the
|
||||||
# known and unknown queues — so nothing else enqueues
|
# known and unknown queues, so nothing else enqueues
|
||||||
close!(known_queue) # 4. now safe to close the queues stage-1 fed
|
close!(known_queue) # 4. now safe to close the queues stage-1 fed
|
||||||
close!(unknown_queue)
|
close!(unknown_queue)
|
||||||
foreach(wait, known_workers) # 5. wait out stage-2 (terminal) and stage-3 — stage-3 is
|
foreach(wait, known_workers) # 5. wait out stage-2 (terminal) and stage-3; stage-3 is
|
||||||
foreach(wait, unknown_workers) # the ONLY producer of the text queue
|
foreach(wait, unknown_workers) # the ONLY producer of the text queue
|
||||||
close!(text_queue) # 6. now safe to close the queue stage-3 fed
|
close!(text_queue) # 6. now safe to close the queue stage-3 fed
|
||||||
foreach(wait, text_workers) # 7. wait out stage-4
|
foreach(wait, text_workers) # 7. wait out stage-4
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
# Stage-5 phase B: the live, single-owner format catalog (DESIGN §5B/§9).
|
# Stage-5 phase B: the live, single-owner format catalog (DESIGN §5B/§9).
|
||||||
#
|
#
|
||||||
# `cluster.jl` is the *science* — feature extraction, the collapsed Gibbs sampler
|
# `cluster.jl` is the *science*: feature extraction, the collapsed Gibbs sampler
|
||||||
# (phase A, offline), and `assign_file` (the phase-B scoring core). This file is
|
# (phase A, offline), and `assign_file` (the phase-B scoring core). This file is
|
||||||
# the *plumbing* that turns that core into a durable, growing catalog:
|
# the *plumbing* that turns that core into a durable, growing catalog:
|
||||||
#
|
#
|
||||||
# * a `Catalog` = the surviving clusters' sufficient statistics + a record of
|
# * a `Catalog` = the surviving clusters' sufficient statistics + a record of
|
||||||
# which files have already been folded in + a few example filenames each;
|
# which files have already been folded in + a few example filenames each;
|
||||||
# * `catalog_sweep!` = the phase-B loop — for every *new* file in `binary/`,
|
# * `catalog_sweep!` = the phase-B loop. For every *new* file in `binary/`,
|
||||||
# run the deterministic CRP-predictive `assign_file` and fold it into the
|
# run the deterministic CRP-predictive `assign_file` and fold it into the
|
||||||
# chosen cluster's stats (DESIGN §5B);
|
# chosen cluster's stats (DESIGN §5B);
|
||||||
# * `compact!` = the offline Gibbs pass that *seeds* the catalog on first run
|
# * `compact!` = the offline Gibbs pass that *seeds* the catalog on first run
|
||||||
@@ -32,19 +32,19 @@ const CATALOG_EXAMPLE_CAP = 8
|
|||||||
|
|
||||||
The mutable phase-B state owned by the single sweep process:
|
The mutable phase-B state owned by the single sweep process:
|
||||||
|
|
||||||
* `n` — header window these clusters were built at (must match the
|
* `n` : header window these clusters were built at (must match the
|
||||||
feature window used to score new files; frozen once seeded).
|
feature window used to score new files; frozen once seeded).
|
||||||
* `clusters` — id → `ClusterStats` (per-position 257-counts + member count).
|
* `clusters` : id → `ClusterStats` (per-position 257-counts + member count).
|
||||||
Ids are **frozen at birth** — never renumbered — so there is no
|
Ids are frozen at birth and never renumbered, so there is no
|
||||||
label switching across sweeps (DESIGN §5).
|
label switching across sweeps (DESIGN §5).
|
||||||
* `examples` — id → up to `CATALOG_EXAMPLE_CAP` member filenames, for the
|
* `examples` : id → up to `CATALOG_EXAMPLE_CAP` member filenames, for the
|
||||||
human nomination glance.
|
human nomination glance.
|
||||||
* `next_id` — the next fresh cluster id to hand out (monotone; retired ids are
|
* `next_id` : the next fresh cluster id to hand out (monotone; retired ids are
|
||||||
never reused, keeping ids globally unique over the catalog's life).
|
never reused, keeping ids globally unique over the catalog's life).
|
||||||
* `processed` — basenames of every `binary/` file already folded in, so a sweep
|
* `processed` : basenames of every `binary/` file already folded in, so a sweep
|
||||||
is incremental: it touches only files it has not seen. This set
|
is incremental: it touches only files it has not seen. This set
|
||||||
grows with the `binary/` pile it mirrors — the same population,
|
grows with the `binary/` pile it mirrors, at the same rate and
|
||||||
no faster — which is acceptable for v1 (DESIGN §9).
|
no faster, which is acceptable for v1 (DESIGN §9).
|
||||||
"""
|
"""
|
||||||
mutable struct Catalog
|
mutable struct Catalog
|
||||||
n::Int
|
n::Int
|
||||||
@@ -69,8 +69,9 @@ end
|
|||||||
# Durable persistence (reuse the stage-2 sidecar-first commit discipline)
|
# Durable persistence (reuse the stage-2 sidecar-first commit discipline)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
# Count tables are stored sparsely — only the non-zero `(position, symbol, count)`
|
# Count tables are stored sparsely, as only the non-zero
|
||||||
# triples — because a cluster's n×257 table is overwhelmingly zero (a peaked
|
# `(position, symbol, count)` triples, because a cluster's n×257 table is
|
||||||
|
# overwhelmingly zero (a peaked
|
||||||
# magic byte touches one of 257 symbols per position). Sparse keeps the catalog
|
# magic byte touches one of 257 symbols per position). Sparse keeps the catalog
|
||||||
# file small and its load O(non-zeros), not O(n·257·K).
|
# file small and its load O(non-zeros), not O(n·257·K).
|
||||||
function _sparse_counts(counts::Matrix{Int})
|
function _sparse_counts(counts::Matrix{Int})
|
||||||
@@ -191,15 +192,15 @@ repeated sweeps are incremental and idempotent over the pile.
|
|||||||
|
|
||||||
Per file, `assign_file` returns the argmax component:
|
Per file, `assign_file` returns the argmax component:
|
||||||
* an existing cluster id → the file joins it (`add!`);
|
* an existing cluster id → the file joins it (`add!`);
|
||||||
* `0` (background) → counted, not clustered — a novel-but-unmatched file parks
|
* `0` (background) → counted, not clustered. A novel-but-unmatched file parks
|
||||||
here by design; genuinely new formats are discovered by the offline
|
here by design; genuinely new formats are discovered by the offline
|
||||||
`compact!` re-clustering the residue, not by single-file minting;
|
`compact!` re-clustering the residue, not by single-file minting;
|
||||||
* `-1` (mint) → a fresh cluster is seeded with a frozen `next_id`. Under the
|
* `-1` (mint) → a fresh cluster is seeded with a frozen `next_id`. Under the
|
||||||
calibrated `bg_mass > α` this never fires on the live path (fresh and
|
calibrated `bg_mass > α` this never fires on the live path (fresh and
|
||||||
background share the one-file likelihood, so background always wins) — the
|
background share the one-file likelihood, so background always wins); the
|
||||||
branch exists for correctness, not as a routine outcome (DESIGN §5B).
|
branch exists for correctness, not as a routine outcome (DESIGN §5B).
|
||||||
|
|
||||||
Mutates `cat` but does NOT persist it — the caller commits once, after the sweep.
|
Mutates `cat` but does NOT persist it; the caller commits once, after the sweep.
|
||||||
Returns a summary of what happened this sweep.
|
Returns a summary of what happened this sweep.
|
||||||
"""
|
"""
|
||||||
function catalog_sweep!(cat::Catalog, cfg::Config)
|
function catalog_sweep!(cat::Catalog, cfg::Config)
|
||||||
@@ -281,7 +282,7 @@ function compact!(cat::Catalog, cfg::Config;
|
|||||||
end
|
end
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Nominations (closing the loop to the classifier — DESIGN §6)
|
# Nominations (closing the loop to the classifier; DESIGN §6)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
"Render a signature (from `signature`) into a human-readable hex template:
|
"Render a signature (from `signature`) into a human-readable hex template:
|
||||||
@@ -312,13 +313,13 @@ end
|
|||||||
|
|
||||||
Write one JSON nomination per promotable cluster (`is_promotable`, DESIGN §6)
|
Write one JSON nomination per promotable cluster (`is_promotable`, DESIGN §6)
|
||||||
into `cfg.nominated_dir`, each carrying the cluster's signature (hex template +
|
into `cfg.nominated_dir`, each carrying the cluster's signature (hex template +
|
||||||
required magic positions), member count, and example filenames — everything a
|
required magic positions), member count, and example filenames: everything a
|
||||||
human needs to glance and promote. The background (id 0) is never a cluster here,
|
human needs to glance and promote. The background (id 0) is never a cluster here,
|
||||||
so it can never be nominated, by construction.
|
so it can never be nominated, by construction.
|
||||||
|
|
||||||
Nominations are rewritten every sweep (membership only grows), so each file is
|
Nominations are rewritten every sweep (membership only grows), so each file is
|
||||||
durably replaced via the same temp→fsync→rename→fsync-dir commit as the catalog.
|
durably replaced via the same temp→fsync→rename→fsync-dir commit as the catalog.
|
||||||
Returns the paths written. Non-promotable clusters are left alone — a cluster
|
Returns the paths written. Non-promotable clusters are left alone; a cluster
|
||||||
that *was* nominated and later fell below threshold cannot happen (members only
|
that *was* nominated and later fell below threshold cannot happen (members only
|
||||||
grow), so there is nothing to retract.
|
grow), so there is nothing to retract.
|
||||||
"""
|
"""
|
||||||
@@ -326,7 +327,7 @@ function write_nominations!(cat::Catalog, cfg::Config)
|
|||||||
mkpath(cfg.nominated_dir)
|
mkpath(cfg.nominated_dir)
|
||||||
written = String[]
|
written = String[]
|
||||||
for (id, c) in sort(collect(cat.clusters); by=first)
|
for (id, c) in sort(collect(cat.clusters); by=first)
|
||||||
sig = signature(c) # default β — signature β is
|
sig = signature(c) # default β; signature β is
|
||||||
# decoupled from clustering β (DESIGN §11.3a)
|
# decoupled from clustering β (DESIGN §11.3a)
|
||||||
is_promotable(c, sig; min_members=cfg.promote_min_members,
|
is_promotable(c, sig; min_members=cfg.promote_min_members,
|
||||||
min_magic=cfg.promote_min_magic) || continue
|
min_magic=cfg.promote_min_magic) || continue
|
||||||
@@ -353,14 +354,14 @@ function write_nominations!(cat::Catalog, cfg::Config)
|
|||||||
end
|
end
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Orchestration + CLI (the periodic single-owner process — DESIGN §9)
|
# Orchestration + CLI (the periodic single-owner process; DESIGN §9)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
"""
|
"""
|
||||||
run_cluster_sweep(cfg; compact=false, rng) -> NamedTuple
|
run_cluster_sweep(cfg; compact=false, rng) -> NamedTuple
|
||||||
|
|
||||||
One end-to-end pass of the single-owner stage-5 process: load the durable
|
One end-to-end pass of the single-owner stage-5 process: load the durable
|
||||||
catalog, either `compact!` (offline Gibbs — used to seed on first run or to
|
catalog, either `compact!` (offline Gibbs, used to seed on first run or to
|
||||||
recompact) or `catalog_sweep!` (the incremental live path), then durably persist
|
recompact) or `catalog_sweep!` (the incremental live path), then durably persist
|
||||||
the catalog and (re)write nominations. This is the whole job the cron/periodic
|
the catalog and (re)write nominations. This is the whole job the cron/periodic
|
||||||
runner performs; `bin/cluster_sweep.jl` is a thin shell around it.
|
runner performs; `bin/cluster_sweep.jl` is a thin shell around it.
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
An in-memory, ready-to-run classifier: the (stateless) Lux `model` plus the
|
An in-memory, ready-to-run classifier: the (stateless) Lux `model` plus the
|
||||||
learned parameters `ps` and states `st` loaded from the artifact. Immutable and
|
learned parameters `ps` and states `st` loaded from the artifact. Immutable and
|
||||||
shared read-only across all worker threads — Lux inference is a pure function
|
shared read-only across all worker threads, since Lux inference is a pure function
|
||||||
over `ps`/`st`, so no locking is needed.
|
over `ps`/`st`, so no locking is needed.
|
||||||
"""
|
"""
|
||||||
struct Classifier{M,P,S}
|
struct Classifier{M,P,S}
|
||||||
@@ -21,7 +21,7 @@ end
|
|||||||
load_classifier(path) -> Classifier
|
load_classifier(path) -> Classifier
|
||||||
|
|
||||||
Rebuild the fixed architecture and load `ps`/`st` from the JLD2 artifact at
|
Rebuild the fixed architecture and load `ps`/`st` from the JLD2 artifact at
|
||||||
`path`. Throws if the file is missing or unreadable — the server fails fast at
|
`path`. Throws if the file is missing or unreadable, so the server fails fast at
|
||||||
startup rather than run silently without classification.
|
startup rather than run silently without classification.
|
||||||
"""
|
"""
|
||||||
function load_classifier(path::AbstractString)
|
function load_classifier(path::AbstractString)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Stage-5: unknown-format discovery by Bayesian header clustering.
|
# Stage-5: unknown-format discovery by Bayesian header clustering.
|
||||||
#
|
#
|
||||||
# See model/DESIGN_clustering.md for the full rationale. In brief: files that
|
# See model/DESIGN_clustering.md for the full rationale. In brief: files that
|
||||||
# stage-3 sorted into `binary/` are the `:unknown` sink — genuinely
|
# stage-3 sorted into `binary/` are the `:unknown` sink: genuinely
|
||||||
# unrecognized bytes. This stage clusters them by *file format* (not producer)
|
# unrecognized bytes. This stage clusters them by *file format* (not producer)
|
||||||
# using the first `HEADER_N` header bytes, modeled as a Dirichlet-process
|
# using the first `HEADER_N` header bytes, modeled as a Dirichlet-process
|
||||||
# mixture of per-position categoricals over a 257-symbol alphabet
|
# mixture of per-position categoricals over a 257-symbol alphabet
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
# This file is deliberately dependency-light: everything below is base Julia
|
# This file is deliberately dependency-light: everything below is base Julia
|
||||||
# (only `log`, no `SpecialFunctions`), so it drops into the existing module and
|
# (only `log`, no `SpecialFunctions`), so it drops into the existing module and
|
||||||
# the offline calibration script alike without touching the Manifest. The model
|
# the offline calibration script alike without touching the Manifest. The model
|
||||||
# is categorical on purpose — do NOT reuse model.jl's [0,1] byte scaling here
|
# is categorical on purpose. Do NOT reuse model.jl's [0,1] byte scaling here
|
||||||
# (that metric is meaningful for the Lux net and meaningless for header bytes,
|
# (that metric is meaningful for the Lux net and meaningless for header bytes,
|
||||||
# where 0x89 and 0x88 are not "close"; see DESIGN §4).
|
# where 0x89 and 0x88 are not "close"; see DESIGN §4).
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ const HEADER_N = 32
|
|||||||
const ALPHABET = 257
|
const ALPHABET = 257
|
||||||
|
|
||||||
"The 'past EOF' symbol (1-based index `ALPHABET`). A file shorter than a given
|
"The 'past EOF' symbol (1-based index `ALPHABET`). A file shorter than a given
|
||||||
position emits this here — real, discriminative signal for fixed-length formats,
|
position emits this here: real, discriminative signal for fixed-length formats,
|
||||||
and it avoids colliding zero-padding with genuine 0x00 header bytes (DESIGN §4)."
|
and it avoids colliding zero-padding with genuine 0x00 header bytes (DESIGN §4)."
|
||||||
const PAST_EOF = ALPHABET
|
const PAST_EOF = ALPHABET
|
||||||
|
|
||||||
@@ -75,7 +75,7 @@ Sufficient statistics for one cluster: a per-position count table `counts`
|
|||||||
(`n × ALPHABET`; `counts[i, v]` = how many member files show symbol `v` at
|
(`n × ALPHABET`; `counts[i, v]` = how many member files show symbol `v` at
|
||||||
position `i`) and the member count `members`. These are exactly what phase-B
|
position `i`) and the member count `members`. These are exactly what phase-B
|
||||||
persists per catalog entry, and everything the collapsed predictive needs.
|
persists per catalog entry, and everything the collapsed predictive needs.
|
||||||
A slot with `members == 0` is inactive (reusable) — the Gibbs sweep prunes
|
A slot with `members == 0` is inactive (reusable): the Gibbs sweep prunes
|
||||||
emptied clusters without renumbering, so surviving cluster ids stay stable.
|
emptied clusters without renumbering, so surviving cluster ids stay stable.
|
||||||
"""
|
"""
|
||||||
mutable struct ClusterStats
|
mutable struct ClusterStats
|
||||||
@@ -111,7 +111,7 @@ Dirichlet-Categorical predictive, given `c`'s current counts: at each position
|
|||||||
`i`, `p(x_i | c) = (counts[i, x_i] + β) / (members + ALPHABET·β)`, summed in log
|
`i`, `p(x_i | c) = (counts[i, x_i] + β) / (members + ALPHABET·β)`, summed in log
|
||||||
space over positions. Call with `c` NOT containing `x` (Gibbs excludes the point
|
space over positions. Call with `c` NOT containing `x` (Gibbs excludes the point
|
||||||
being resampled), so an emptied cluster reduces to the uniform prior `1/ALPHABET`
|
being resampled), so an emptied cluster reduces to the uniform prior `1/ALPHABET`
|
||||||
per position — identical to a brand-new cluster, as it should be.
|
per position, identical to a brand-new cluster, as it should be.
|
||||||
"""
|
"""
|
||||||
function log_predictive(c::ClusterStats, x::AbstractVector{<:Integer}, β::Float64)
|
function log_predictive(c::ClusterStats, x::AbstractVector{<:Integer}, β::Float64)
|
||||||
denom = log(c.members + ALPHABET * β)
|
denom = log(c.members + ALPHABET * β)
|
||||||
@@ -129,7 +129,7 @@ log_uniform(n::Integer) = -n * log(ALPHABET)
|
|||||||
|
|
||||||
# Lanczos approximation to log Γ(x) for x > 0, so partition scoring (below) needs
|
# Lanczos approximation to log Γ(x) for x > 0, so partition scoring (below) needs
|
||||||
# the Dirichlet-multinomial marginal's gamma terms without pulling in
|
# the Dirichlet-multinomial marginal's gamma terms without pulling in
|
||||||
# SpecialFunctions — keeping this stage dependency-flat (no Manifest churn).
|
# SpecialFunctions, keeping this stage dependency-flat (no Manifest churn).
|
||||||
# g = 7, standard coefficients; accurate to ~1e-14 over the range we use.
|
# g = 7, standard coefficients; accurate to ~1e-14 over the range we use.
|
||||||
const _LANCZOS_G = 7
|
const _LANCZOS_G = 7
|
||||||
const _LANCZOS_C = (0.99999999999980993, 676.5203681218851, -1259.1392167224028,
|
const _LANCZOS_C = (0.99999999999980993, 676.5203681218851, -1259.1392167224028,
|
||||||
@@ -148,7 +148,7 @@ function loggamma(x::Float64)
|
|||||||
end
|
end
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Phase A: collapsed Gibbs sampler (offline — the science)
|
# Phase A: collapsed Gibbs sampler (offline; the science)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@@ -207,7 +207,7 @@ function _gibbs_once(X::AbstractMatrix{<:Integer};
|
|||||||
# from the background deadlocks: at a format's first file, a fresh cluster
|
# from the background deadlocks: at a format's first file, a fresh cluster
|
||||||
# and the background are equally uniform, so with bg_mass ≥ α the background
|
# and the background are equally uniform, so with bg_mass ≥ α the background
|
||||||
# always wins and no real cluster is ever seeded. Singleton init sidesteps
|
# always wins and no real cluster is ever seeded. Singleton init sidesteps
|
||||||
# this — same-format singletons merge and snowball, while a lone
|
# this: same-format singletons merge and snowball, while a lone
|
||||||
# random-blob singleton dissolves on resample and is reclaimed by the
|
# random-blob singleton dissolves on resample and is reclaimed by the
|
||||||
# (stickier) background. See DESIGN §4a.
|
# (stickier) background. See DESIGN §4a.
|
||||||
z = collect(1:N)
|
z = collect(1:N)
|
||||||
@@ -274,7 +274,7 @@ function _gibbs_once(X::AbstractMatrix{<:Integer};
|
|||||||
return GibbsResult(z, clusters, partition_logmarginal(X, z, clusters, α, β))
|
return GibbsResult(z, clusters, partition_logmarginal(X, z, clusters, α, β))
|
||||||
end
|
end
|
||||||
|
|
||||||
"Argmax of `logw .+ Gumbel noise` — an exact draw from softmax(logw) without
|
"Argmax of `logw .+ Gumbel noise`: an exact draw from softmax(logw) without
|
||||||
normalizing (numerically safe for the tiny header-likelihood magnitudes)."
|
normalizing (numerically safe for the tiny header-likelihood magnitudes)."
|
||||||
function _gumbel_argmax(logw::AbstractVector{Float64}, rng::AbstractRNG)
|
function _gumbel_argmax(logw::AbstractVector{Float64}, rng::AbstractRNG)
|
||||||
best_i = 1
|
best_i = 1
|
||||||
@@ -293,12 +293,12 @@ end
|
|||||||
partition_logmarginal(X, z, clusters, α, β) -> Float64
|
partition_logmarginal(X, z, clusters, α, β) -> Float64
|
||||||
|
|
||||||
The joint log-evidence `log p(z, X)` of a partition under the CRP prior and the
|
The joint log-evidence `log p(z, X)` of a partition under the CRP prior and the
|
||||||
collapsed Dirichlet-Categorical likelihood — the principled score for ranking
|
collapsed Dirichlet-Categorical likelihood. This is the principled score for ranking
|
||||||
Gibbs restarts (higher = better). It is the sum of:
|
Gibbs restarts (higher = better). It is the sum of:
|
||||||
|
|
||||||
* the Dirichlet-multinomial **marginal** of each cluster's per-position counts,
|
* the Dirichlet-multinomial **marginal** of each cluster's per-position counts,
|
||||||
`lΓ(Aβ) − lΓ(mₖ+Aβ) + Σ_v [lΓ(c_v+β) − lΓ(β)]`, whose normalizer supplies the
|
`lΓ(Aβ) − lΓ(mₖ+Aβ) + Σ_v [lΓ(c_v+β) − lΓ(β)]`, whose normalizer supplies the
|
||||||
Occam penalty that a plain product-of-predictives lacks — it is what makes a
|
Occam penalty that a plain product-of-predictives lacks. It is what makes a
|
||||||
*merged, heterogeneous* cluster score **worse** than two clean ones (an
|
*merged, heterogeneous* cluster score **worse** than two clean ones (an
|
||||||
earlier pseudo-likelihood scorer omitted this and wrongly rewarded merging);
|
earlier pseudo-likelihood scorer omitted this and wrongly rewarded merging);
|
||||||
* the CRP prior over the clustered points, `K·log α + Σₖ lΓ(mₖ) + lΓ(α) −
|
* the CRP prior over the clustered points, `K·log α + Σₖ lΓ(mₖ) + lΓ(α) −
|
||||||
@@ -335,7 +335,7 @@ function partition_logmarginal(X::AbstractMatrix{<:Integer}, z::AbstractVector{<
|
|||||||
end
|
end
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Phase B: sequential CRP-predictive assignment (online — the catalog)
|
# Phase B: sequential CRP-predictive assignment (online; the catalog)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@@ -380,7 +380,7 @@ function assign_file(x::AbstractVector{<:Integer}, clusters::Dict{Int,ClusterSta
|
|||||||
end
|
end
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Signatures and promotion (closing the loop to the classifier — DESIGN §6)
|
# Signatures and promotion (closing the loop to the classifier; DESIGN §6)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@@ -390,13 +390,13 @@ Turn a cluster's counts into a libmagic-style template: at each position, if the
|
|||||||
modal symbol's posterior probability exceeds `peak_threshold`, that byte is
|
modal symbol's posterior probability exceeds `peak_threshold`, that byte is
|
||||||
*required* (returned as the 0–255 byte value, or `PAST_EOF`); otherwise the
|
*required* (returned as the 0–255 byte value, or `PAST_EOF`); otherwise the
|
||||||
position is a wildcard (`nothing`). The vector of required bytes IS the
|
position is a wildcard (`nothing`). The vector of required bytes IS the
|
||||||
magic-number template — the whole point of the categorical model (DESIGN §4).
|
magic-number template, the whole point of the categorical model (DESIGN §4).
|
||||||
|
|
||||||
Peakedness is a **Bernoulli** question ("is this position fixed to byte `v`, or
|
Peakedness is a **Bernoulli** question ("is this position fixed to byte `v`, or
|
||||||
not?"), so it uses a 2-way posterior mean `(count + β)/(members + 2β)` — NOT the
|
not?"), so it uses a 2-way posterior mean `(count + β)/(members + 2β)`, NOT the
|
||||||
257-way mixture predictive. The alphabet-wide version would smear the estimate
|
257-way mixture predictive. The alphabet-wide version would smear the estimate
|
||||||
across 257 symbols (`members + 257β` in the denominator), pulling even a
|
across 257 symbols (`members + 257β` in the denominator), pulling even a
|
||||||
unanimous position below any sane threshold once β is small — which would make
|
unanimous position below any sane threshold once β is small, which would make
|
||||||
promotion impossible. This decouples signature detection from the clustering
|
promotion impossible. This decouples signature detection from the clustering
|
||||||
pseudocount and the alphabet size.
|
pseudocount and the alphabet size.
|
||||||
"""
|
"""
|
||||||
@@ -415,7 +415,7 @@ function signature(c::ClusterStats; peak_threshold::Float64=0.9, β::Float64=0.5
|
|||||||
return sig
|
return sig
|
||||||
end
|
end
|
||||||
|
|
||||||
"Number of fixed (non-wildcard) positions in a signature — its 'magic length'."
|
"Number of fixed (non-wildcard) positions in a signature: its 'magic length'."
|
||||||
magic_positions(sig::AbstractVector) = count(!isnothing, sig)
|
magic_positions(sig::AbstractVector) = count(!isnothing, sig)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@@ -423,7 +423,7 @@ magic_positions(sig::AbstractVector) = count(!isnothing, sig)
|
|||||||
|
|
||||||
A cluster qualifies for *nomination* (still human-gated, DESIGN §6) when it has
|
A cluster qualifies for *nomination* (still human-gated, DESIGN §6) when it has
|
||||||
at least `min_members` files AND at least `min_magic` fixed signature positions.
|
at least `min_members` files AND at least `min_magic` fixed signature positions.
|
||||||
The background (id 0) is never passed here — it is never promotable by design.
|
The background (id 0) is never passed here; it is never promotable by design.
|
||||||
"""
|
"""
|
||||||
function is_promotable(c::ClusterStats, sig::AbstractVector;
|
function is_promotable(c::ClusterStats, sig::AbstractVector;
|
||||||
min_members::Integer=20, min_magic::Integer=3)
|
min_members::Integer=20, min_magic::Integer=3)
|
||||||
@@ -448,7 +448,7 @@ end
|
|||||||
|
|
||||||
Adjusted Rand Index between two labelings of the same items: 1.0 = identical
|
Adjusted Rand Index between two labelings of the same items: 1.0 = identical
|
||||||
partitions (up to relabeling), ~0.0 = chance agreement, can go negative. This is
|
partitions (up to relabeling), ~0.0 = chance agreement, can go negative. This is
|
||||||
the §7 calibration objective — grid-tuning maximizes ARI of recovered-vs-truth
|
the §7 calibration objective: grid-tuning maximizes ARI of recovered-vs-truth
|
||||||
(magic-collapsed) labels. Hand-rolled to keep the dependency footprint flat;
|
(magic-collapsed) labels. Hand-rolled to keep the dependency footprint flat;
|
||||||
matches `Clustering.randindex`.
|
matches `Clustering.randindex`.
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Base.@kwdef struct Config
|
|||||||
# Every in-flight file lives here, at every stage, from intake until it is
|
# Every in-flight file lives here, at every stage, from intake until it is
|
||||||
# committed to a terminal sink below. Stages route by enqueueing a reference,
|
# committed to a terminal sink below. Stages route by enqueueing a reference,
|
||||||
# not by moving bytes (src/worker.jl header), so there are no per-stage
|
# not by moving bytes (src/worker.jl header), so there are no per-stage
|
||||||
# directories — the queues are what know how far a file has got.
|
# directories; the queues are what know how far a file has got.
|
||||||
spool_dir::String = "data/spool"
|
spool_dir::String = "data/spool"
|
||||||
binary_dir::String = "data/binary" # stage-3 sink: unknown files that look like binary data
|
binary_dir::String = "data/binary" # stage-3 sink: unknown files that look like binary data
|
||||||
done_dir::String = "data/done" # fully enriched known files (+ .meta.json sidecars)
|
done_dir::String = "data/done" # fully enriched known files (+ .meta.json sidecars)
|
||||||
@@ -33,7 +33,7 @@ Base.@kwdef struct Config
|
|||||||
failed_dir::String = "data/failed" # files move here if a worker throws
|
failed_dir::String = "data/failed" # files move here if a worker throws
|
||||||
model_path::String = "model/classifier.jld2" # committed classifier artifact, loaded at startup
|
model_path::String = "model/classifier.jld2" # committed classifier artifact, loaded at startup
|
||||||
# Intake reads each upload off the socket in chunks of this size and streams
|
# Intake reads each upload off the socket in chunks of this size and streams
|
||||||
# them straight to the spool file, so this — not the file size — is what
|
# them straight to the spool file, so this, not the file size, is what
|
||||||
# bounds intake memory per in-flight upload (see src/multipart.jl).
|
# bounds intake memory per in-flight upload (see src/multipart.jl).
|
||||||
upload_chunk_bytes::Int = UPLOAD_CHUNK_BYTES
|
upload_chunk_bytes::Int = UPLOAD_CHUNK_BYTES
|
||||||
exiftool_timeout::Int = 30 # seconds before a stuck exiftool is killed → degraded sidecar
|
exiftool_timeout::Int = 30 # seconds before a stuck exiftool is killed → degraded sidecar
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
#
|
#
|
||||||
# A file that stage-1 couldn't recognize is still sorted into one of two coarse
|
# A file that stage-1 couldn't recognize is still sorted into one of two coarse
|
||||||
# buckets so downstream tooling can treat them differently: text (human-readable)
|
# buckets so downstream tooling can treat them differently: text (human-readable)
|
||||||
# and binary (everything else). Only binary is a directory — it is terminal, so
|
# and binary (everything else). Only binary is a directory, because it is terminal:
|
||||||
# the file is committed to `binary/`; a text file has stage 4 still to come, so it
|
# the file is committed to `binary/`; a text file has stage 4 still to come, so it
|
||||||
# stays in `spool/` and only its queue reference moves on. We sniff only the first
|
# stays in `spool/` and only its queue reference moves on. We sniff only the first
|
||||||
# `CONTENT_SNIFF_BYTES` (no full read) and ask two questions: does the window
|
# `CONTENT_SNIFF_BYTES` (no full read) and ask two questions: does the window
|
||||||
# decode as valid UTF-8, and are any of its control bytes ones that don't belong
|
# decode as valid UTF-8, and are any of its control bytes ones that don't belong
|
||||||
# in text? This is the Unicode-aware successor to the classic "NUL byte" test —
|
# in text? This is the Unicode-aware successor to the classic "NUL byte" test.
|
||||||
# it accepts non-ASCII text (accents, CJK, emoji) instead of misfiling it as
|
# It accepts non-ASCII text (accents, CJK, emoji) instead of misfiling it as
|
||||||
# binary, while still rejecting binary formats, which almost never form valid
|
# binary, while still rejecting binary formats, which almost never form valid
|
||||||
# UTF-8 near their start (and a NUL is never a valid UTF-8 scalar, so it still
|
# UTF-8 near their start (and a NUL is never a valid UTF-8 scalar, so it still
|
||||||
# reads as binary for free).
|
# reads as binary for free).
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# on disk in the spool directory, and only this small reference travels through
|
# on disk in the spool directory, and only this small reference travels through
|
||||||
# the queue. This is what keeps intake fast and memory flat regardless of file
|
# the queue. This is what keeps intake fast and memory flat regardless of file
|
||||||
# size, and it's the shape you'd publish to RabbitMQ later (the "claim check"
|
# size, and it's the shape you'd publish to RabbitMQ later (the "claim check"
|
||||||
# pattern — enqueue a reference, not the payload).
|
# pattern: enqueue a reference, not the payload).
|
||||||
|
|
||||||
struct Job
|
struct Job
|
||||||
id::String # server-minted UUID; also the on-disk filename prefix
|
id::String # server-minted UUID; also the on-disk filename prefix
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
# *what* it is. This stage answers two questions and records them in a
|
# *what* it is. This stage answers two questions and records them in a
|
||||||
# `.meta.json` sidecar, exactly like the stage-2 known-file enrichment:
|
# `.meta.json` sidecar, exactly like the stage-2 known-file enrichment:
|
||||||
#
|
#
|
||||||
# * natural language — via Languages.jl's `LanguageDetector` (a Julia port of
|
# * natural language, via Languages.jl's `LanguageDetector` (a Julia port of
|
||||||
# the `whatlang` n-gram model): English vs. French vs. Japanese, plus a
|
# the `whatlang` n-gram model): English vs. French vs. Japanese, plus a
|
||||||
# confidence score. Pure Julia, no subprocess.
|
# confidence score. Pure Julia, no subprocess.
|
||||||
# * programming language — via the `github-linguist` CLI, which recognizes
|
# * programming language, via the `github-linguist` CLI, which recognizes
|
||||||
# source and markup by extension + content heuristics. There is no
|
# source and markup by extension + content heuristics. There is no
|
||||||
# comparable native Julia library, so we shell out (mirroring stage-2's
|
# comparable native Julia library, so we shell out (mirroring stage-2's
|
||||||
# exiftool dependency).
|
# exiftool dependency).
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
#
|
#
|
||||||
# The github-linguist quirk that shapes this code: run against a path *inside* a
|
# The github-linguist quirk that shapes this code: run against a path *inside* a
|
||||||
# git repository, linguist reads the file's committed git blob, not the bytes on
|
# git repository, linguist reads the file's committed git blob, not the bytes on
|
||||||
# disk — and an untracked file (which every file under `data/` is) has no blob,
|
# disk, and an untracked file (which every file under `data/` is) has no blob,
|
||||||
# so it crashes. We sidestep this by copying the file to a fresh temp dir outside
|
# so it crashes. We sidestep this by copying the file to a fresh temp dir outside
|
||||||
# any repo (preserving its name so linguist's extension heuristics still fire)
|
# any repo (preserving its name so linguist's extension heuristics still fire)
|
||||||
# and pointing linguist there.
|
# and pointing linguist there.
|
||||||
@@ -58,7 +58,7 @@ end
|
|||||||
Run the `LanguageDetector` on `text`, returning the language's English name
|
Run the `LanguageDetector` on `text`, returning the language's English name
|
||||||
(e.g. `"English"`), its ISO 639-3 code (e.g. `"eng"`), and the model's
|
(e.g. `"English"`), its ISO 639-3 code (e.g. `"eng"`), and the model's
|
||||||
confidence in `[0,1]`. Returns `(nothing, nothing, nothing)` when there is no
|
confidence in `[0,1]`. Returns `(nothing, nothing, nothing)` when there is no
|
||||||
usable text (empty/whitespace) or the detector errors — the caller records that
|
usable text (empty/whitespace) or the detector errors; the caller records that
|
||||||
as a degraded result rather than failing the file.
|
as a degraded result rather than failing the file.
|
||||||
"""
|
"""
|
||||||
function detect_natural_language(detector, text::AbstractString)
|
function detect_natural_language(detector, text::AbstractString)
|
||||||
@@ -80,7 +80,7 @@ when linguist can't identify one. Plain prose reports as `"Text"` and
|
|||||||
unrecognized content as JSON `null`; both collapse to `nothing` here, since only
|
unrecognized content as JSON `null`; both collapse to `nothing` here, since only
|
||||||
a real programming/markup language is worth recording.
|
a real programming/markup language is worth recording.
|
||||||
|
|
||||||
`path` MUST be outside any git repository — see the module header for why.
|
`path` MUST be outside any git repository; see the module header for why.
|
||||||
"""
|
"""
|
||||||
function run_linguist(path::AbstractString, timeout::Integer)
|
function run_linguist(path::AbstractString, timeout::Integer)
|
||||||
bytes = run_with_timeout(`github-linguist --json $path`, timeout)
|
bytes = run_with_timeout(`github-linguist --json $path`, timeout)
|
||||||
@@ -104,8 +104,8 @@ end
|
|||||||
detect_programming_language(job, cfg) -> Union{String,Nothing}
|
detect_programming_language(job, cfg) -> Union{String,Nothing}
|
||||||
|
|
||||||
Programming/markup language of a text file, or `nothing`. Copies the file to a
|
Programming/markup language of a text file, or `nothing`. Copies the file to a
|
||||||
throwaway temp dir *outside* the git repo — under its sanitized original name so
|
throwaway temp dir *outside* the git repo (under its sanitized original name, so
|
||||||
linguist's extension heuristics still apply — runs linguist there, and cleans up.
|
linguist's extension heuristics still apply), runs linguist there, and cleans up.
|
||||||
"""
|
"""
|
||||||
function detect_programming_language(job::Job, cfg::Config)
|
function detect_programming_language(job::Job, cfg::Config)
|
||||||
lang = nothing
|
lang = nothing
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
# Stage-2 metadata extraction and enrichment.
|
# Stage-2 metadata extraction and enrichment.
|
||||||
#
|
#
|
||||||
# Known files are enriched by shelling out to `exiftool -json -G` (the only tool
|
# Known files are enriched by shelling out to `exiftool -json -G` (the only tool
|
||||||
# with broad, multi-format coverage — there is no comparable native Julia
|
# with broad, multi-format coverage; there is no comparable native Julia
|
||||||
# library), then normalizing its output into a small, stable, documented schema
|
# library), then normalizing its output into a small, stable, documented schema
|
||||||
# that downstream consumers can rely on, while preserving the full raw dump.
|
# that downstream consumers can rely on, while preserving the full raw dump.
|
||||||
#
|
#
|
||||||
# exiftool being installed is a hard startup prerequisite (see `assert_exiftool`,
|
# exiftool being installed is a hard startup prerequisite (see `assert_exiftool`,
|
||||||
# called from `run`). A per-file extraction failure or hang does NOT quarantine
|
# called from `run`). A per-file extraction failure or hang does NOT quarantine
|
||||||
# the file — it produces a *degraded* sidecar recording what we know plus the
|
# the file. It produces a *degraded* sidecar recording what we know plus the
|
||||||
# error, because a file that passed classification is wanted regardless of
|
# error, because a file that passed classification is wanted regardless of
|
||||||
# whether we could read its metadata.
|
# whether we could read its metadata.
|
||||||
|
|
||||||
"Throw at startup if the `exiftool` binary isn't on PATH — fail fast rather than discover it per file."
|
"Throw at startup if the `exiftool` binary isn't on PATH: fail fast rather than discover it per file."
|
||||||
function assert_exiftool()
|
function assert_exiftool()
|
||||||
try
|
try
|
||||||
Base.run(pipeline(`exiftool -ver`; stdout=devnull, stderr=devnull))
|
Base.run(pipeline(`exiftool -ver`; stdout=devnull, stderr=devnull))
|
||||||
@@ -27,14 +27,14 @@ end
|
|||||||
# colon. Extend a field simply by appending tag names here.
|
# colon. Extend a field simply by appending tag names here.
|
||||||
#
|
#
|
||||||
# Note the documented `Creator` ambiguity: in PDF it's the authoring app, but
|
# Note the documented `Creator` ambiguity: in PDF it's the authoring app, but
|
||||||
# elsewhere it's the person. We take the simple route — `Creator` feeds
|
# elsewhere it's the person. We take the simple route: `Creator` feeds
|
||||||
# `created_by` only, and `author` relies on the person-specific tags.
|
# `created_by` only, and `author` relies on the person-specific tags.
|
||||||
const CREATED_BY_TAGS = ["Producer", "CreatorTool", "Creator", "Software", "Application", "Encoder", "EncodingTool", "HostComputer"]
|
const CREATED_BY_TAGS = ["Producer", "CreatorTool", "Creator", "Software", "Application", "Encoder", "EncodingTool", "HostComputer"]
|
||||||
const AUTHOR_TAGS = ["Author", "Artist", "By-line", "Owner", "Artist"]
|
const AUTHOR_TAGS = ["Author", "Artist", "By-line", "Owner", "Artist"]
|
||||||
const CREATED_DATE_TAGS = ["DateTimeOriginal", "CreateDate", "MediaCreateDate", "CreationDate"]
|
const CREATED_DATE_TAGS = ["DateTimeOriginal", "CreateDate", "MediaCreateDate", "CreationDate"]
|
||||||
const MODIFIED_DATE_TAGS = ["ModifyDate", "FileModifyDate"]
|
const MODIFIED_DATE_TAGS = ["ModifyDate", "FileModifyDate"]
|
||||||
|
|
||||||
"fsync an open file descriptor, throwing on failure — used to make a write durable before a rename commits it."
|
"fsync an open file descriptor, throwing on failure. Makes a write durable before a rename commits it."
|
||||||
function fsync_fd(fd)
|
function fsync_fd(fd)
|
||||||
ccall(:fsync, Cint, (Cint,), fd) == 0 || error("fsync failed: $(Base.Libc.strerror())")
|
ccall(:fsync, Cint, (Cint,), fd) == 0 || error("fsync failed: $(Base.Libc.strerror())")
|
||||||
return nothing
|
return nothing
|
||||||
@@ -73,7 +73,7 @@ const KILL_GRACE_SECONDS = 2.0
|
|||||||
"""
|
"""
|
||||||
Send `signum` to the whole process group `pgid` (a negative pid means "the group"
|
Send `signum` to the whole process group `pgid` (a negative pid means "the group"
|
||||||
to `kill(2)`). Julia's `kill(::Process, sig)` signals only the child itself,
|
to `kill(2)`). Julia's `kill(::Process, sig)` signals only the child itself,
|
||||||
which is not enough to enforce a timeout — see `run_with_timeout`.
|
which is not enough to enforce a timeout; see `run_with_timeout`.
|
||||||
"""
|
"""
|
||||||
function signal_group(pgid::Integer, signum::Integer)
|
function signal_group(pgid::Integer, signum::Integer)
|
||||||
ccall(:kill, Cint, (Cint, Cint), -pgid, signum)
|
ccall(:kill, Cint, (Cint, Cint), -pgid, signum)
|
||||||
@@ -109,7 +109,7 @@ function run_with_timeout(cmd::Cmd, timeout::Integer)
|
|||||||
# A one-shot timer, cancelled the moment the child exits, rather than a
|
# A one-shot timer, cancelled the moment the child exits, rather than a
|
||||||
# polling loop the caller has to join. The polling version charged every
|
# polling loop the caller has to join. The polling version charged every
|
||||||
# call the remainder of its in-flight `sleep(0.1)` *after* the child had
|
# call the remainder of its in-flight `sleep(0.1)` *after* the child had
|
||||||
# already exited — ~50 ms on average, and a measured 101 ms on a process
|
# already exited: ~50 ms on average, and a measured 101 ms on a process
|
||||||
# that exits instantly. That is pure latency on the hot path of two stages
|
# that exits instantly. That is pure latency on the hot path of two stages
|
||||||
# (exiftool here, github-linguist in stage 4), and it dwarfed the work on
|
# (exiftool here, github-linguist in stage 4), and it dwarfed the work on
|
||||||
# anything but a slow file. Waiting on the process directly costs nothing
|
# anything but a slow file. Waiting on the process directly costs nothing
|
||||||
@@ -122,7 +122,7 @@ function run_with_timeout(cmd::Cmd, timeout::Integer)
|
|||||||
# Escalate: a process that ignores/defers SIGTERM would otherwise pin the
|
# Escalate: a process that ignores/defers SIGTERM would otherwise pin the
|
||||||
# worker forever on the wait(proc) below, defeating the timeout. This
|
# worker forever on the wait(proc) below, defeating the timeout. This
|
||||||
# runs off the timer's task so the event loop isn't held during the
|
# runs off the timer's task so the event loop isn't held during the
|
||||||
# grace period, and it is not joined — by the time it wakes, `wait(proc)`
|
# grace period, and it is not joined: by the time it wakes, `wait(proc)`
|
||||||
# has long since returned and `process_running` settles it.
|
# has long since returned and `process_running` settles it.
|
||||||
Threads.@spawn begin
|
Threads.@spawn begin
|
||||||
deadline = time() + KILL_GRACE_SECONDS
|
deadline = time() + KILL_GRACE_SECONDS
|
||||||
@@ -235,7 +235,7 @@ Sequence: write `<name>.meta.json` to a temp name, fsync its bytes, rename it
|
|||||||
into place, fsync `dest_dir` so the rename itself is durable, THEN move the file
|
into place, fsync `dest_dir` so the rename itself is durable, THEN move the file
|
||||||
into `dest_dir`. A crash between the two leaves only a harmless orphan sidecar in
|
into `dest_dir`. A crash between the two leaves only a harmless orphan sidecar in
|
||||||
`dest_dir` while the file stays in its stage dir, so stage-aware recovery
|
`dest_dir` while the file stays in its stage dir, so stage-aware recovery
|
||||||
re-drives it and overwrites the sidecar — idempotent. The fsyncs make the
|
re-drives it and overwrites the sidecar, idempotently. The fsyncs make the
|
||||||
ordering hold across power loss, not just process crashes.
|
ordering hold across power loss, not just process crashes.
|
||||||
"""
|
"""
|
||||||
function commit_enriched!(dest_dir::AbstractString, job::Job, meta)
|
function commit_enriched!(dest_dir::AbstractString, job::Job, meta)
|
||||||
|
|||||||
@@ -2,14 +2,14 @@
|
|||||||
#
|
#
|
||||||
# Why this exists: HTTP.jl's `parse_multipart_form` takes the *complete* request
|
# Why this exists: HTTP.jl's `parse_multipart_form` takes the *complete* request
|
||||||
# body as a byte vector, so using it means every file in the request sits in
|
# body as a byte vector, so using it means every file in the request sits in
|
||||||
# memory at once — and is then copied again per part. That contradicts the whole
|
# memory at once, and is then copied again per part. That contradicts the whole
|
||||||
# point of this service: file bytes belong on disk, and only a small reference
|
# point of this service: file bytes belong on disk, and only a small reference
|
||||||
# travels through the queue. So intake needs a parser that never holds a file.
|
# travels through the queue. So intake needs a parser that never holds a file.
|
||||||
#
|
#
|
||||||
# This reader walks the body incrementally: it pulls fixed-size chunks off the
|
# This reader walks the body incrementally: it pulls fixed-size chunks off the
|
||||||
# socket and hands each part's bytes straight to a sink (the spool file). Peak
|
# socket and hands each part's bytes straight to a sink (the spool file). Peak
|
||||||
# memory per connection is `chunk_bytes` + the boundary length, regardless of how
|
# memory per connection is `chunk_bytes` + the boundary length, regardless of how
|
||||||
# large — or how many — the uploaded files are.
|
# large, or how many, the uploaded files are.
|
||||||
#
|
#
|
||||||
# Interface: two calls in a loop, so the caller keeps ordinary control flow
|
# Interface: two calls in a loop, so the caller keeps ordinary control flow
|
||||||
# rather than inverting into callbacks.
|
# rather than inverting into callbacks.
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
# So the delimiter that *closes* a body is CRLF + "--" + boundary, and the two
|
# So the delimiter that *closes* a body is CRLF + "--" + boundary, and the two
|
||||||
# bytes after it say whether another part follows (CRLF) or the form is over
|
# bytes after it say whether another part follows (CRLF) or the form is over
|
||||||
# ("--"). Every read is bounded, and the buffer retains only the last
|
# ("--"). Every read is bounded, and the buffer retains only the last
|
||||||
# `length(delimiter)-1` bytes when no delimiter is found — that tail is what
|
# `length(delimiter)-1` bytes when no delimiter is found; that tail is what
|
||||||
# makes a delimiter split across two chunks parse correctly.
|
# makes a delimiter split across two chunks parse correctly.
|
||||||
|
|
||||||
"Default socket read size, and therefore the memory bound per in-flight upload."
|
"Default socket read size, and therefore the memory bound per in-flight upload."
|
||||||
@@ -91,8 +91,8 @@ end
|
|||||||
multipart_boundary(content_type) -> String | nothing
|
multipart_boundary(content_type) -> String | nothing
|
||||||
|
|
||||||
Pull the boundary out of a `multipart/form-data` Content-Type header. Returns
|
Pull the boundary out of a `multipart/form-data` Content-Type header. Returns
|
||||||
`nothing` if the header is missing, is some other media type, or has no boundary
|
`nothing` if the header is missing, is some other media type, or has no boundary.
|
||||||
— all of which are the same 400 to a caller.
|
All of those are the same 400 to a caller.
|
||||||
"""
|
"""
|
||||||
function multipart_boundary(content_type::Union{AbstractString,Nothing})
|
function multipart_boundary(content_type::Union{AbstractString,Nothing})
|
||||||
content_type === nothing && return nothing
|
content_type === nothing && return nothing
|
||||||
@@ -139,7 +139,7 @@ function seek_needle!(r::MultipartReader, needle::Vector{UInt8}; limit::Int = 0)
|
|||||||
idx === nothing || return idx
|
idx === nothing || return idx
|
||||||
# Only the last length(needle)-1 bytes can still be part of a match, but
|
# Only the last length(needle)-1 bytes can still be part of a match, but
|
||||||
# the caller may need the skipped bytes (a part body), so trimming is the
|
# the caller may need the skipped bytes (a part body), so trimming is the
|
||||||
# caller's job — we only enforce the optional limit.
|
# caller's job; we only enforce the optional limit.
|
||||||
limit > 0 && navail(r) > limit &&
|
limit > 0 && navail(r) > limit &&
|
||||||
throw(MultipartError("no delimiter within $limit bytes"))
|
throw(MultipartError("no delimiter within $limit bytes"))
|
||||||
compact!(r)
|
compact!(r)
|
||||||
@@ -174,7 +174,7 @@ end
|
|||||||
|
|
||||||
Advance to the next part and return its headers, or `nothing` at the end of the
|
Advance to the next part and return its headers, or `nothing` at the end of the
|
||||||
form. The previous part's body must have been consumed first (with
|
form. The previous part's body must have been consumed first (with
|
||||||
[`write_part_body!`](@ref) or [`skip_part_body!`](@ref)) — the reader cannot skip
|
[`write_part_body!`](@ref) or [`skip_part_body!`](@ref)). The reader cannot skip
|
||||||
a body it hasn't been told to, because the body is only bounded by finding the
|
a body it hasn't been told to, because the body is only bounded by finding the
|
||||||
next delimiter.
|
next delimiter.
|
||||||
"""
|
"""
|
||||||
@@ -226,7 +226,7 @@ function read_part_headers!(r::MultipartReader)
|
|||||||
r.pos += 2
|
r.pos += 2
|
||||||
return MultipartPart(nothing, nothing, nothing)
|
return MultipartPart(nothing, nothing, nothing)
|
||||||
end
|
end
|
||||||
# The `limit` here bounds *buffering* — it only fires when the headers span
|
# The `limit` here bounds *buffering*, and only fires when the headers span
|
||||||
# chunks. The explicit length check below is the actual policy, so the rule
|
# chunks. The explicit length check below is the actual policy, so the rule
|
||||||
# doesn't depend on how the body happened to be chunked on the wire.
|
# doesn't depend on how the body happened to be chunked on the wire.
|
||||||
idx = seek_needle!(r, CRLFCRLF; limit = MAX_PART_HEADER_BYTES)
|
idx = seek_needle!(r, CRLFCRLF; limit = MAX_PART_HEADER_BYTES)
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# Today those are backed by an in-process, bounded, thread-safe buffer
|
# Today those are backed by an in-process, bounded, thread-safe buffer
|
||||||
# (the Go-channel / Julia-`Channel` model). To move to RabbitMQ (or any broker)
|
# (the Go-channel / Julia-`Channel` model). To move to RabbitMQ (or any broker)
|
||||||
# later, implement a new `JobQueue` subtype with these three methods and swap
|
# later, implement a new `JobQueue` subtype with these three methods and swap
|
||||||
# the construction in `run` — no HTTP handler or worker code needs to change.
|
# the construction in `run`. No HTTP handler or worker code needs to change.
|
||||||
|
|
||||||
abstract type JobQueue end
|
abstract type JobQueue end
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ function enqueue! end
|
|||||||
dequeue!(q) -> Union{Job,Nothing}
|
dequeue!(q) -> Union{Job,Nothing}
|
||||||
|
|
||||||
Blocks until a job is available and returns it. Returns `nothing` only when the
|
Blocks until a job is available and returns it. Returns `nothing` only when the
|
||||||
queue has been closed *and* fully drained — the signal for a worker to exit.
|
queue has been closed *and* fully drained, which is a worker's signal to exit.
|
||||||
"""
|
"""
|
||||||
function dequeue! end
|
function dequeue! end
|
||||||
|
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
#
|
#
|
||||||
# The handler's whole job is to get files onto the queue fast and get out of the
|
# The handler's whole job is to get files onto the queue fast and get out of the
|
||||||
# way: stream each uploaded file to disk, enqueue a reference, respond 202. It
|
# way: stream each uploaded file to disk, enqueue a reference, respond 202. It
|
||||||
# never does real processing — that's the workers' job.
|
# never does real processing; that's the workers' job.
|
||||||
#
|
#
|
||||||
# Intake is *streamed*, not buffered (see src/multipart.jl for the reader). This
|
# Intake is *streamed*, not buffered (see src/multipart.jl for the reader). This
|
||||||
# is what makes the service's memory story hold end to end: bytes go from the
|
# is what makes the service's memory story hold end to end: bytes go from the
|
||||||
# socket to the spool file a chunk at a time, so a 4 GB upload costs the same
|
# socket to the spool file a chunk at a time, so a 4 GB upload costs the same
|
||||||
# resident memory as a 4 KB one. It is also why /upload is served by its own
|
# resident memory as a 4 KB one. It is also why /upload is served by its own
|
||||||
# stream handler rather than an Oxygen route — see `root_stream_handler`.
|
# stream handler rather than an Oxygen route; see `root_stream_handler`.
|
||||||
#
|
#
|
||||||
# NOTE: routes are registered at runtime via `register_routes()` (called from
|
# NOTE: routes are registered at runtime via `register_routes()` (called from
|
||||||
# `run`), NOT with top-level macros. In a precompiled package, top-level
|
# `run`), NOT with top-level macros. In a precompiled package, top-level
|
||||||
@@ -24,10 +24,10 @@ function health_handler(_::HTTP.Request)
|
|||||||
end
|
end
|
||||||
|
|
||||||
"""
|
"""
|
||||||
`GET /stats` — the pipeline's own counters (src/stats.jl), as JSON.
|
`GET /stats`: the pipeline's own counters (src/stats.jl), as JSON.
|
||||||
|
|
||||||
Read-only and cheap: a few atomic loads and one `length` per queue, no pipeline
|
Read-only and cheap: a few atomic loads and one `length` per queue, no pipeline
|
||||||
state touched. Two scrapes Δt apart give per-stage throughput and utilization —
|
state touched. Two scrapes Δt apart give per-stage throughput and utilization;
|
||||||
see bin/bench.jl, which is the intended consumer.
|
see bin/bench.jl, which is the intended consumer.
|
||||||
|
|
||||||
Unlike `/upload` this is an ordinary Oxygen route: it has no body to stream, and
|
Unlike `/upload` this is an ordinary Oxygen route: it has no body to stream, and
|
||||||
@@ -54,7 +54,7 @@ end
|
|||||||
Read and discard whatever is left of the request body.
|
Read and discard whatever is left of the request body.
|
||||||
|
|
||||||
HTTP.jl's server calls `closeread` after the handler and *errors* if the body was
|
HTTP.jl's server calls `closeread` after the handler and *errors* if the body was
|
||||||
only partly consumed — a half-read body can't be followed by another request on a
|
only partly consumed, because a half-read body can't be followed by another request on a
|
||||||
keep-alive connection. So every exit path drains first. Discarding is bounded in
|
keep-alive connection. So every exit path drains first. Discarding is bounded in
|
||||||
memory (one chunk) and costs nothing in the normal case, where the body is
|
memory (one chunk) and costs nothing in the normal case, where the body is
|
||||||
already fully consumed and this returns immediately.
|
already fully consumed and this returns immediately.
|
||||||
@@ -72,7 +72,7 @@ Did this exception mean the client went away, rather than something being wrong
|
|||||||
on our side?
|
on our side?
|
||||||
|
|
||||||
A client that hangs up mid-upload (user cancels, network drops) is routine, and
|
A client that hangs up mid-upload (user cancels, network drops) is routine, and
|
||||||
must not be logged as a server error or reported as a failed write — but it looks
|
must not be logged as a server error or reported as a failed write. But it looks
|
||||||
like an I/O failure from inside the parser, so the distinction has to be made
|
like an I/O failure from inside the parser, so the distinction has to be made
|
||||||
explicitly. `EOFError` is what `HTTP.Stream` raises when a connection dies with
|
explicitly. `EOFError` is what `HTTP.Stream` raises when a connection dies with
|
||||||
bytes still promised by `Content-Length`.
|
bytes still promised by `Content-Length`.
|
||||||
@@ -87,22 +87,22 @@ Stream a multipart upload to disk, one part at a time.
|
|||||||
Each file part is spooled straight from the socket and its reference enqueued.
|
Each file part is spooled straight from the socket and its reference enqueued.
|
||||||
The response reports what was actually queued:
|
The response reports what was actually queued:
|
||||||
|
|
||||||
* `202` — every file in the request was spooled and queued
|
* `202`: every file in the request was spooled and queued
|
||||||
* `400` — not multipart/form-data, no files present, or a malformed body
|
* `400`: not multipart/form-data, no files present, or a malformed body
|
||||||
* `503` — the intake queue filled up; `accepted` lists what got in first
|
* `503`: the intake queue filled up; `accepted` lists what got in first
|
||||||
* `500` — a file could not be written to disk
|
* `500`: a file could not be written to disk
|
||||||
|
|
||||||
Unlike a buffered handler, this one cannot know up front how many files a request
|
Unlike a buffered handler, this one cannot know up front how many files a request
|
||||||
holds or whether they will fit. So when the queue fills mid-request it does not
|
holds or whether they will fit. So when the queue fills mid-request it does not
|
||||||
abandon the connection: it stops spooling (discarding the remaining parts rather
|
abandon the connection: it stops spooling (discarding the remaining parts rather
|
||||||
than writing files it can't queue), drains the body, and answers `503` with the
|
than writing files it can't queue), drains the body, and answers `503` with the
|
||||||
`accepted` list. Files already queued stay queued — a client can retry the rest.
|
`accepted` list. Files already queued stay queued, so a client can retry the rest.
|
||||||
"""
|
"""
|
||||||
function upload_stream_handler(stream::HTTP.Stream)
|
function upload_stream_handler(stream::HTTP.Stream)
|
||||||
try
|
try
|
||||||
return serve_upload!(stream)
|
return serve_upload!(stream)
|
||||||
catch e
|
catch e
|
||||||
# The client vanished — while we were reading its body, draining it, or
|
# The client vanished while we were reading its body, draining it, or
|
||||||
# answering. Nothing is wrong on our side, so log it as the routine event
|
# answering. Nothing is wrong on our side, so log it as the routine event
|
||||||
# it is instead of a server error.
|
# it is instead of a server error.
|
||||||
is_client_gone(e) || rethrow()
|
is_client_gone(e) || rethrow()
|
||||||
@@ -163,7 +163,7 @@ function serve_upload!(stream::HTTP.Stream)
|
|||||||
catch e
|
catch e
|
||||||
(e isa MultipartError || is_client_gone(e)) && rethrow()
|
(e isa MultipartError || is_client_gone(e)) && rethrow()
|
||||||
# A disk error leaves the reader mid-part, so the rest of the body
|
# A disk error leaves the reader mid-part, so the rest of the body
|
||||||
# can no longer be parsed — stop and report.
|
# can no longer be parsed, so stop and report.
|
||||||
@error "spool failed" name=part.filename exception=(e, catch_backtrace())
|
@error "spool failed" name=part.filename exception=(e, catch_backtrace())
|
||||||
failure = (500, "failed to store file")
|
failure = (500, "failed to store file")
|
||||||
break
|
break
|
||||||
@@ -203,13 +203,13 @@ end
|
|||||||
root_stream_handler(middleware) -> (stream -> nothing)
|
root_stream_handler(middleware) -> (stream -> nothing)
|
||||||
|
|
||||||
Oxygen's root handler wraps `HTTP.streamhandler`, which does
|
Oxygen's root handler wraps `HTTP.streamhandler`, which does
|
||||||
`request.body = read(stream)` — the entire body into memory — *before* any route
|
`request.body = read(stream)`, the entire body into memory, *before* any route
|
||||||
is dispatched. That happens even for an Oxygen `@stream` route, so no route can
|
is dispatched. That happens even for an Oxygen `@stream` route, so no route can
|
||||||
stream an upload. We therefore intercept `POST /upload` at the stream level and
|
stream an upload. We therefore intercept `POST /upload` at the stream level and
|
||||||
hand everything else to Oxygen unchanged.
|
hand everything else to Oxygen unchanged.
|
||||||
|
|
||||||
Trade-off: `/upload` bypasses Oxygen's middleware chain, so it is absent from
|
Trade-off: `/upload` bypasses Oxygen's middleware chain, so it is absent from
|
||||||
Oxygen's built-in metrics and docs. Deliberate — flat intake memory is the point
|
Oxygen's built-in metrics and docs. Deliberate: flat intake memory is the point
|
||||||
of this service, and intake is covered by our own counters (`/stats`) and `@info`
|
of this service, and intake is covered by our own counters (`/stats`) and `@info`
|
||||||
records anyway.
|
records anyway.
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ and build the `Job` from however many bytes it reports writing.
|
|||||||
|
|
||||||
This is the streaming counterpart to `spool_file`: the caller pumps bytes in from
|
This is the streaming counterpart to `spool_file`: the caller pumps bytes in from
|
||||||
the network as they arrive, so a file never exists in memory in one piece. A
|
the network as they arrive, so a file never exists in memory in one piece. A
|
||||||
partial file left by a failed or abandoned write is removed — intake either
|
partial file left by a failed or abandoned write is removed: intake either
|
||||||
produces a complete spooled file or nothing at all, so recovery on restart never
|
produces a complete spooled file or nothing at all, so recovery on restart never
|
||||||
picks up a truncated upload.
|
picks up a truncated upload.
|
||||||
"""
|
"""
|
||||||
@@ -55,7 +55,7 @@ Move a spooled file into `dir`, returning the destination.
|
|||||||
|
|
||||||
This runs once per file, at the end: into a terminal sink (`done/`, `text_done/`,
|
This runs once per file, at the end: into a terminal sink (`done/`, `text_done/`,
|
||||||
`binary/`) or into `failed/` when a handler throws. Files are *not* moved between
|
`binary/`) or into `failed/` when a handler throws. Files are *not* moved between
|
||||||
stages — see the header of src/worker.jl.
|
stages; see the header of src/worker.jl.
|
||||||
"""
|
"""
|
||||||
function move_to(dir::AbstractString, job::Job)::String
|
function move_to(dir::AbstractString, job::Job)::String
|
||||||
dest = joinpath(dir, basename(job.path))
|
dest = joinpath(dir, basename(job.path))
|
||||||
@@ -75,7 +75,7 @@ intake that never finished) onto `queue`. This is the payoff of spooling to
|
|||||||
disk: a restart resumes work instead of stranding it. Returns the number of
|
disk: a restart resumes work instead of stranding it. Returns the number of
|
||||||
files recovered.
|
files recovered.
|
||||||
|
|
||||||
A file's stage is not recorded on disk — it lives in whichever in-process queue
|
A file's stage is not recorded on disk. It lives in whichever in-process queue
|
||||||
holds its reference, and a crash loses that (src/worker.jl header). So everything
|
holds its reference, and a crash loses that (src/worker.jl header). So everything
|
||||||
still in `spool/` re-enters at stage 1 and replays. Replay is safe rather than
|
still in `spool/` re-enters at stage 1 and replays. Replay is safe rather than
|
||||||
merely tolerable: classification and the binary/text sniff are pure functions of
|
merely tolerable: classification and the binary/text sniff are pure functions of
|
||||||
@@ -86,7 +86,7 @@ replayed file lands where it would have landed and overwrites its own sidecar.
|
|||||||
every in-flight file, so a crash under load can easily leave more leftovers than
|
every in-flight file, so a crash under load can easily leave more leftovers than
|
||||||
one queue's capacity. Dropping the excess would mean recovery quietly losing the
|
one queue's capacity. Dropping the excess would mean recovery quietly losing the
|
||||||
work it exists to save. Because the caller spawns the worker pools *before*
|
work it exists to save. Because the caller spawns the worker pools *before*
|
||||||
recovering, the consumers are live and the queue drains as we fill it — parking
|
recovering, the consumers are live and the queue drains as we fill it, so parking
|
||||||
here costs latency, never progress.
|
here costs latency, never progress.
|
||||||
|
|
||||||
Skips `.meta.json` sidecars: those are enrichment output, not work to redo.
|
Skips `.meta.json` sidecars: those are enrichment output, not work to redo.
|
||||||
|
|||||||
28
src/stats.jl
28
src/stats.jl
@@ -5,7 +5,7 @@
|
|||||||
# cannot even approximate it: every in-flight file sits in `spool/` regardless of
|
# cannot even approximate it: every in-flight file sits in `spool/` regardless of
|
||||||
# how far it has got, because stages route by enqueueing a reference rather than
|
# how far it has got, because stages route by enqueueing a reference rather than
|
||||||
# by moving bytes (src/worker.jl header). A file's stage is a property of the
|
# by moving bytes (src/worker.jl header). A file's stage is a property of the
|
||||||
# queue holding it, so only the pipeline itself can see it — there is no
|
# queue holding it, so only the pipeline itself can see it. There is no
|
||||||
# directory to poll.
|
# directory to poll.
|
||||||
#
|
#
|
||||||
# So each stage keeps four counters, all incremented in `worker_loop` (the one
|
# So each stage keeps four counters, all incremented in `worker_loop` (the one
|
||||||
@@ -23,15 +23,15 @@
|
|||||||
# utilization = (Δbusy_ns - Δblocked_ns) / (Δt * workers) ~1.0 ⇒ bottleneck
|
# utilization = (Δbusy_ns - Δblocked_ns) / (Δt * workers) ~1.0 ⇒ bottleneck
|
||||||
#
|
#
|
||||||
# Utilization is the useful one. Throughput alone can't distinguish a stage that
|
# Utilization is the useful one. Throughput alone can't distinguish a stage that
|
||||||
# is saturated from one that is merely starved by the stage ahead of it — both
|
# is saturated from one that is merely starved by the stage ahead of it: both
|
||||||
# show the same files/s — whereas utilization separates them: the saturated stage
|
# show the same files/s. Utilization separates them: the saturated stage
|
||||||
# sits near 1.0 with its queue backing up, the starved stage sits near 0.
|
# sits near 1.0 with its queue backing up, the starved stage sits near 0.
|
||||||
#
|
#
|
||||||
# `blocked_ns` is what keeps that true downstream. Stages 1 and 3 apply blocking
|
# `blocked_ns` is what keeps that true downstream. Stages 1 and 3 apply blocking
|
||||||
# backpressure: when the next queue is full the handler parks and retries rather
|
# backpressure: when the next queue is full the handler parks and retries rather
|
||||||
# than dropping the file (see ROUTE_ENQUEUE_RETRY_SECONDS). That parked time is
|
# than dropping the file (see ROUTE_ENQUEUE_RETRY_SECONDS). That parked time is
|
||||||
# inside the handler, so counting it as busy would show stage 1 pinned at 1.0
|
# inside the handler, so counting it as busy would show stage 1 pinned at 1.0
|
||||||
# whenever stage 2 is the real bottleneck — every stage upstream of the jam would
|
# whenever stage 2 is the real bottleneck, and every stage upstream of the jam would
|
||||||
# look like the jam. Subtracting it leaves utilization meaning "doing its own
|
# look like the jam. Subtracting it leaves utilization meaning "doing its own
|
||||||
# work", and the blocked share becomes its own signal: a stage blocked 90% of the
|
# work", and the blocked share becomes its own signal: a stage blocked 90% of the
|
||||||
# time is naming its successor as the bottleneck.
|
# time is naming its successor as the bottleneck.
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
# a scrape is stateless and two readers can't disturb each other.
|
# a scrape is stateless and two readers can't disturb each other.
|
||||||
#
|
#
|
||||||
# Cost is a handful of atomic adds per file, against handlers that spawn
|
# Cost is a handful of atomic adds per file, against handlers that spawn
|
||||||
# exiftool — unmeasurable in practice, and the counters are never read on the
|
# exiftool: unmeasurable in practice, and the counters are never read on the
|
||||||
# hot path.
|
# hot path.
|
||||||
|
|
||||||
# Stage identity lives here, in declaration order, so the report, the JSON and
|
# Stage identity lives here, in declaration order, so the report, the JSON and
|
||||||
@@ -55,7 +55,7 @@ const STAGE_TITLES = (classify = "classify", enrich = "enrich",
|
|||||||
Counters for one pipeline stage. All fields are atomic and monotonic: workers
|
Counters for one pipeline stage. All fields are atomic and monotonic: workers
|
||||||
only ever add, readers only ever read, so no lock is needed between them.
|
only ever add, readers only ever read, so no lock is needed between them.
|
||||||
|
|
||||||
`in_flight` is the exception to monotonic — it goes up and down — and is the one
|
`in_flight` is the exception to monotonic. It goes up and down, and is the one
|
||||||
counter that is a *level* rather than a total.
|
counter that is a *level* rather than a total.
|
||||||
"""
|
"""
|
||||||
struct StageStats
|
struct StageStats
|
||||||
@@ -74,8 +74,8 @@ StageStats() = StageStats(Threads.Atomic{Int}(0), Threads.Atomic{Int}(0),
|
|||||||
"""
|
"""
|
||||||
Counters for HTTP intake, which has no worker loop to hang them off.
|
Counters for HTTP intake, which has no worker loop to hang them off.
|
||||||
|
|
||||||
`files` counts what was actually spooled *and* queued — the same thing the 202
|
`files` counts what was actually spooled *and* queued, the same thing the 202
|
||||||
body reports as `accepted` — so it lines up with stage 1's arrivals. Files
|
body reports as `accepted`, so it lines up with stage 1's arrivals. Files
|
||||||
dropped because the queue was full are counted separately in `rejected`, since a
|
dropped because the queue was full are counted separately in `rejected`, since a
|
||||||
run where intake outruns the pipeline should be visible as backpressure rather
|
run where intake outruns the pipeline should be visible as backpressure rather
|
||||||
than as slow intake.
|
than as slow intake.
|
||||||
@@ -96,7 +96,7 @@ from.
|
|||||||
|
|
||||||
`since` matters to a reader computing rates from a single scrape: without it,
|
`since` matters to a reader computing rates from a single scrape: without it,
|
||||||
"1000 files completed" has no denominator. Readers that scrape twice should use
|
"1000 files completed" has no denominator. Readers that scrape twice should use
|
||||||
their own Δt instead — it excludes the time before they started watching.
|
their own Δt instead, which excludes the time before they started watching.
|
||||||
"""
|
"""
|
||||||
struct Metrics
|
struct Metrics
|
||||||
intake::IntakeStats
|
intake::IntakeStats
|
||||||
@@ -117,7 +117,7 @@ const METRICS = Metrics()
|
|||||||
reset_metrics!()
|
reset_metrics!()
|
||||||
|
|
||||||
Zero every counter and restart the measurement window. For tests, and for a
|
Zero every counter and restart the measurement window. For tests, and for a
|
||||||
benchmark that wants totals covering only its own run — though a harness that
|
benchmark that wants totals covering only its own run, though a harness that
|
||||||
scrapes before and after can subtract instead, which is safer against a server
|
scrapes before and after can subtract instead, which is safer against a server
|
||||||
that is also serving someone else.
|
that is also serving someone else.
|
||||||
"""
|
"""
|
||||||
@@ -153,14 +153,14 @@ the parked time to `stats.blocked_ns`.
|
|||||||
|
|
||||||
This is the routing half of stages 1 and 3: a classified file is never dropped,
|
This is the routing half of stages 1 and 3: a classified file is never dropped,
|
||||||
so a full downstream queue means waiting, not failing. Wrapping the retry loop
|
so a full downstream queue means waiting, not failing. Wrapping the retry loop
|
||||||
here — rather than repeating `while !enqueue! sleep end` at each call site — is
|
here, rather than repeating `while !enqueue! sleep end` at each call site, is
|
||||||
what makes that wait measurable at all, and keeps the three routing paths from
|
what makes that wait measurable at all, and keeps the three routing paths from
|
||||||
drifting into three different backoff behaviours.
|
drifting into three different backoff behaviours.
|
||||||
|
|
||||||
`stats` is `nothing` for callers that are not a pipeline stage — startup
|
`stats` is `nothing` for callers that are not a pipeline stage. Startup
|
||||||
recovery (`recover_dir!`) uses the same never-drop retry, but it runs outside any
|
recovery (`recover_dir!`) uses the same never-drop retry, but it runs outside any
|
||||||
handler, so it has no `busy_ns` to charge against. Billing its wait to a stage's
|
handler, so it has no `busy_ns` to charge against. Billing its wait to a stage's
|
||||||
`blocked_ns` would make `/stats` utilization — `(Δbusy_ns - Δblocked_ns) / …` —
|
`blocked_ns` would make `/stats` utilization, `(Δbusy_ns - Δblocked_ns) / …`,
|
||||||
go *negative* after a long recovery. Skipping the charge keeps `blocked_ns`
|
go *negative* after a long recovery. Skipping the charge keeps `blocked_ns`
|
||||||
meaning exactly what its docs say: time a handler spent parked on its successor.
|
meaning exactly what its docs say: time a handler spent parked on its successor.
|
||||||
"""
|
"""
|
||||||
@@ -183,7 +183,7 @@ end
|
|||||||
Read every counter into a plain value tree for `GET /stats`.
|
Read every counter into a plain value tree for `GET /stats`.
|
||||||
|
|
||||||
`queues` is a NamedTuple of `JobQueue`s keyed by `STAGE_KEYS`, supplying each
|
`queues` is a NamedTuple of `JobQueue`s keyed by `STAGE_KEYS`, supplying each
|
||||||
stage's live depth and capacity — the counters above are about work *done*, and
|
stage's live depth and capacity. The counters above are about work *done*, and
|
||||||
a stage's depth is what says whether work is piling up in front of it.
|
a stage's depth is what says whether work is piling up in front of it.
|
||||||
|
|
||||||
The read is not atomic across stages: counters keep moving while we walk them,
|
The read is not atomic across stages: counters keep moving while we walk them,
|
||||||
|
|||||||
@@ -15,15 +15,15 @@
|
|||||||
# intake and stays there for its whole in-flight life; only the small `Job`
|
# intake and stays there for its whole in-flight life; only the small `Job`
|
||||||
# reference travels, and `job.path` is therefore constant from intake until the
|
# reference travels, and `job.path` is therefore constant from intake until the
|
||||||
# file is committed. The stage a file has reached lives in the queue holding its
|
# file is committed. The stage a file has reached lives in the queue holding its
|
||||||
# reference, not in which directory the bytes sit — so the intermediate hops
|
# reference, not in which directory the bytes sit, so the intermediate hops
|
||||||
# (spool→known, spool→unknown, unknown→text) are three renames per file that buy
|
# (spool→known, spool→unknown, unknown→text) are three renames per file that buy
|
||||||
# nothing on the live path. What remains is one move at the end: into a terminal
|
# nothing on the live path. What remains is one move at the end: into a terminal
|
||||||
# sink (`done/`, `text_done/`, `binary/`) or into `failed/` on a throw.
|
# sink (`done/`, `text_done/`, `binary/`) or into `failed/` on a throw.
|
||||||
#
|
#
|
||||||
# The cost is on restart. The queues are in-process (src/queue.jl), so a crash
|
# The cost is on restart. The queues are in-process (src/queue.jl), so a crash
|
||||||
# loses them, and recovery can only re-drive everything in `spool/` from stage 1.
|
# loses them, and recovery can only re-drive everything in `spool/` from stage 1.
|
||||||
# That is safe — classification and the UTF-8 sniff are pure functions of the
|
# That is safe, since classification and the UTF-8 sniff are pure functions of
|
||||||
# file's bytes and every commit is idempotent — but it redoes work the old
|
# the file's bytes and every commit is idempotent, but it redoes work the old
|
||||||
# directory-per-stage layout could skip. The durable fix is the queue seam, not
|
# directory-per-stage layout could skip. The durable fix is the queue seam, not
|
||||||
# the directories: a broker-backed `JobQueue` restores exact resume for free.
|
# the directories: a broker-backed `JobQueue` restores exact resume for free.
|
||||||
#
|
#
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
# Per-file logging in stage 1 is `@debug`, not `@info`, because it is the
|
# Per-file logging in stage 1 is `@debug`, not `@info`, because it is the
|
||||||
# stage's dominant cost. Measured by bin/bench_stage1.jl (2000 x 64 KiB files,
|
# stage's dominant cost. Measured by bin/bench_stage1.jl (2000 x 64 KiB files,
|
||||||
# min of 5 trials): a formatted pair of log lines costs 71.2 µs per file, against
|
# min of 5 trials): a formatted pair of log lines costs 71.2 µs per file, against
|
||||||
# the 11.7 µs the whole handler takes with them switched off — six times the rest
|
# the 11.7 µs the whole handler takes with them switched off: six times the rest
|
||||||
# of the stage put together. Nearly all of it is `ConsoleLogger` formatting
|
# of the stage put together. Nearly all of it is `ConsoleLogger` formatting
|
||||||
# (64.2 µs); the FlushLogger's per-message flush is only ~7 µs on top. Switching
|
# (64.2 µs); the FlushLogger's per-message flush is only ~7 µs on top. Switching
|
||||||
# them back on with `JULIA_DEBUG=FileServer` takes the handler to 106.3 µs, i.e.
|
# them back on with `JULIA_DEBUG=FileServer` takes the handler to 106.3 µs, i.e.
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
#
|
#
|
||||||
# With logging off the stage is the classifier and nothing else: classify 10.30 µs
|
# With logging off the stage is the classifier and nothing else: classify 10.30 µs
|
||||||
# (of which read_features is 7.82 µs), the queue handoff 0.12 µs, the disabled
|
# (of which read_features is 7.82 µs), the queue handoff 0.12 µs, the disabled
|
||||||
# `@debug` lines 0.29 µs — 10.7 µs of the 11.7 µs total. Removing the inter-stage
|
# `@debug` lines 0.29 µs, for 10.7 µs of the 11.7 µs total. Removing the inter-stage
|
||||||
# rename is what left it that way: that rename was 11.6 µs per file, so it was
|
# rename is what left it that way: that rename was 11.6 µs per file, so it was
|
||||||
# the equal of the classifier, and dropping it took one worker from ~35k to
|
# the equal of the classifier, and dropping it took one worker from ~35k to
|
||||||
# ~85k files/s (16 workers: ~333k files/s).
|
# ~85k files/s (16 workers: ~333k files/s).
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
# `@debug` is compiled to a min-level check that doesn't evaluate its arguments,
|
# `@debug` is compiled to a min-level check that doesn't evaluate its arguments,
|
||||||
# so a disabled line costs ~0.15 µs rather than ~36 µs. The messages are still
|
# so a disabled line costs ~0.15 µs rather than ~36 µs. The messages are still
|
||||||
# there when wanted: run with `JULIA_DEBUG=FileServer` to get them back. Errors,
|
# there when wanted: run with `JULIA_DEBUG=FileServer` to get them back. Errors,
|
||||||
# quarantines and lifecycle events stay at `@error`/`@info` — they are rare and
|
# quarantines and lifecycle events stay at `@error`/`@info`, since they are rare and
|
||||||
# their cost doesn't scale with throughput. `GET /stats` (src/stats.jl) is the
|
# their cost doesn't scale with throughput. `GET /stats` (src/stats.jl) is the
|
||||||
# per-file observability that survives, and it is counted, not formatted.
|
# per-file observability that survives, and it is counted, not formatted.
|
||||||
|
|
||||||
@@ -91,11 +91,11 @@ end
|
|||||||
handle_known_job(job, cfg, worker_id)
|
handle_known_job(job, cfg, worker_id)
|
||||||
|
|
||||||
Stage 2. Extract metadata (exiftool, with timeout) and enrich: build the
|
Stage 2. Extract metadata (exiftool, with timeout) and enrich: build the
|
||||||
normalized sidecar and commit both to `done/` sidecar-first — the file's one and
|
normalized sidecar and commit both to `done/` sidecar-first: the file's one and
|
||||||
only move, straight out of `spool/`. Extraction
|
only move, straight out of `spool/`. Extraction
|
||||||
failure/timeout yields a *degraded* sidecar (the file is still a wanted known
|
failure/timeout yields a *degraded* sidecar (the file is still a wanted known
|
||||||
file), so the only way to land in `failed/` is a genuine I/O error writing the
|
file), so the only way to land in `failed/` is a genuine I/O error writing the
|
||||||
sidecar or moving the file — handled by `worker_loop`'s quarantine.
|
sidecar or moving the file, handled by `worker_loop`'s quarantine.
|
||||||
"""
|
"""
|
||||||
function handle_known_job(job::Job, cfg::Config, worker_id::Int)
|
function handle_known_job(job::Job, cfg::Config, worker_id::Int)
|
||||||
meta = build_metadata(job, cfg)
|
meta = build_metadata(job, cfg)
|
||||||
@@ -111,7 +111,7 @@ Stage 3. Sort an unrecognized file into a coarse content bucket by sniffing its
|
|||||||
first bytes.
|
first bytes.
|
||||||
|
|
||||||
The two outcomes are asymmetric, because one is terminal and one is not. Binary
|
The two outcomes are asymmetric, because one is terminal and one is not. Binary
|
||||||
is the end of the live path, so the file is committed to `binary/` — which is
|
is the end of the live path, so the file is committed to `binary/`, which is
|
||||||
also where the offline stage-5 discovery sweep reads its corpus, so the move is
|
also where the offline stage-5 discovery sweep reads its corpus, so the move is
|
||||||
load-bearing, not bookkeeping. Text has a stage 4 still to come, so nothing moves:
|
load-bearing, not bookkeeping. Text has a stage 4 still to come, so nothing moves:
|
||||||
the same `Job` goes onto the language-enrichment queue, retrying on a full queue
|
the same `Job` goes onto the language-enrichment queue, retrying on a full queue
|
||||||
@@ -136,10 +136,10 @@ end
|
|||||||
|
|
||||||
Stage 4. Enrich a text file with its natural language (via `detector`) and
|
Stage 4. Enrich a text file with its natural language (via `detector`) and
|
||||||
programming language (via github-linguist): build the sidecar and commit both to
|
programming language (via github-linguist): build the sidecar and commit both to
|
||||||
`text_done/` sidecar-first — the file's one and only move, straight out of
|
`text_done/` sidecar-first: the file's one and only move, straight out of
|
||||||
`spool/`. Detection failure yields a *degraded* sidecar (the
|
`spool/`. Detection failure yields a *degraded* sidecar (the
|
||||||
file is still wanted text), so the only way to land in `failed/` is a genuine I/O
|
file is still wanted text), so the only way to land in `failed/` is a genuine I/O
|
||||||
error committing — handled by `worker_loop`'s quarantine.
|
error committing, handled by `worker_loop`'s quarantine.
|
||||||
"""
|
"""
|
||||||
function handle_text_job(job::Job, cfg::Config, worker_id::Int, detector)
|
function handle_text_job(job::Job, cfg::Config, worker_id::Int, detector)
|
||||||
meta = build_text_metadata(detector, job, cfg)
|
meta = build_text_metadata(detector, job, cfg)
|
||||||
@@ -152,18 +152,18 @@ end
|
|||||||
worker_loop(worker_id, cfg, queue, handler, stats)
|
worker_loop(worker_id, cfg, queue, handler, stats)
|
||||||
|
|
||||||
Consume jobs from `queue` until it is closed and drained, running `handler` on
|
Consume jobs from `queue` until it is closed and drained, running `handler` on
|
||||||
each. A failure on one job is logged and the file quarantined in `failed/` — it
|
each. A failure on one job is logged and the file quarantined in `failed/`. It
|
||||||
must never kill the worker, or the pool would silently shrink.
|
must never kill the worker, or the pool would silently shrink.
|
||||||
|
|
||||||
This loop is also where per-stage metrics are recorded (`stats`, see
|
This loop is also where per-stage metrics are recorded (`stats`, see
|
||||||
src/stats.jl). Instrumenting here rather than in each handler means every stage
|
src/stats.jl). Instrumenting here rather than in each handler means every stage
|
||||||
is measured the same way, by construction, and a new stage is measured the
|
is measured the same way, by construction, and a new stage is measured the
|
||||||
moment it is wired up — there is no per-handler bookkeeping to forget.
|
moment it is wired up, with no per-handler bookkeeping to forget.
|
||||||
|
|
||||||
The timed region is the handler alone, excluding the `dequeue!` above it: time
|
The timed region is the handler alone, excluding the `dequeue!` above it: time
|
||||||
parked waiting for work is idleness, and counting it as service time would make
|
parked waiting for work is idleness, and counting it as service time would make
|
||||||
an idle stage look as busy as a saturated one. A quarantined job still counts
|
an idle stage look as busy as a saturated one. A quarantined job still counts
|
||||||
its time — the work was done, it just ended in `failed/`.
|
its time: the work was done, it just ended in `failed/`.
|
||||||
"""
|
"""
|
||||||
function worker_loop(worker_id::Int, cfg::Config, queue::JobQueue, handler,
|
function worker_loop(worker_id::Int, cfg::Config, queue::JobQueue, handler,
|
||||||
stats::StageStats)
|
stats::StageStats)
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ end
|
|||||||
@test p.filename == "a b.txt"
|
@test p.filename == "a b.txt"
|
||||||
@test p.content_type == "text/plain"
|
@test p.content_type == "text/plain"
|
||||||
|
|
||||||
# `name=` must not match inside `filename=` — that would label every
|
# `name=` must not match inside `filename=`; that would label every
|
||||||
# file part with a bogus name and (worse) hide a missing real name.
|
# file part with a bogus name and (worse) hide a missing real name.
|
||||||
p = parse_part_headers("Content-Disposition: form-data; filename=\"only.txt\"")
|
p = parse_part_headers("Content-Disposition: form-data; filename=\"only.txt\"")
|
||||||
@test p.name === nothing
|
@test p.name === nothing
|
||||||
@@ -290,7 +290,7 @@ end
|
|||||||
@testset "run_with_timeout: returns as soon as the child exits" begin
|
@testset "run_with_timeout: returns as soon as the child exits" begin
|
||||||
# Regression guard. The original implementation polled with sleep(0.1)
|
# Regression guard. The original implementation polled with sleep(0.1)
|
||||||
# and joined the polling task, so every call paid the remainder of an
|
# and joined the polling task, so every call paid the remainder of an
|
||||||
# in-flight sleep after the child had already exited — ~101 ms on a
|
# in-flight sleep after the child had already exited: ~101 ms on a
|
||||||
# process that exits instantly, on the hot path of stages 2 and 4. The
|
# process that exits instantly, on the hot path of stages 2 and 4. The
|
||||||
# bound here is deliberately loose (a loaded CI box is slow) but far
|
# bound here is deliberately loose (a loaded CI box is slow) but far
|
||||||
# under the 100 ms floor the polling version could not beat.
|
# under the 100 ms floor the polling version could not beat.
|
||||||
@@ -369,7 +369,7 @@ end
|
|||||||
write(txt, "hello, world\nsecond line\n")
|
write(txt, "hello, world\nsecond line\n")
|
||||||
@test is_binary(txt) == false
|
@test is_binary(txt) == false
|
||||||
|
|
||||||
# Non-ASCII UTF-8 (accents, CJK, emoji) is valid text — the whole
|
# Non-ASCII UTF-8 (accents, CJK, emoji) is valid text, which is the
|
||||||
# point of moving off the printable-ASCII/NUL heuristic.
|
# point of moving off the printable-ASCII/NUL heuristic.
|
||||||
uni = joinpath(root, "unicode.txt")
|
uni = joinpath(root, "unicode.txt")
|
||||||
write(uni, "café — 日本語 — 🚀\n")
|
write(uni, "café — 日本語 — 🚀\n")
|
||||||
@@ -434,7 +434,7 @@ end
|
|||||||
# A text file is routed onto the stage-4 queue and *does not move*:
|
# A text file is routed onto the stage-4 queue and *does not move*:
|
||||||
# stage 4 is still to come, so the bytes stay in spool/ and the same
|
# stage 4 is still to come, so the bytes stay in spool/ and the same
|
||||||
# reference is handed on. Regression guard against re-introducing an
|
# reference is handed on. Regression guard against re-introducing an
|
||||||
# intermediate hop — the queue, not a directory, is what records that
|
# intermediate hop: the queue, not a directory, is what records that
|
||||||
# this file has cleared triage.
|
# this file has cleared triage.
|
||||||
tpath = joinpath(cfg.spool_dir, "id-t-notes.log")
|
tpath = joinpath(cfg.spool_dir, "id-t-notes.log")
|
||||||
write(tpath, "just some log text\n")
|
write(tpath, "just some log text\n")
|
||||||
@@ -451,7 +451,7 @@ end
|
|||||||
@testset "handle_classify_job: routes by enqueue only, never moves the file" begin
|
@testset "handle_classify_job: routes by enqueue only, never moves the file" begin
|
||||||
# Stage 1's entire job is picking a queue. Whichever way the classifier
|
# Stage 1's entire job is picking a queue. Whichever way the classifier
|
||||||
# votes, the bytes must stay where intake wrote them and the *same* Job
|
# votes, the bytes must stay where intake wrote them and the *same* Job
|
||||||
# must be handed on — the queue records the phase, not a directory.
|
# must be handed on: the queue records the phase, not a directory.
|
||||||
# Asserted against both queues at once so the test doesn't depend on how
|
# Asserted against both queues at once so the test doesn't depend on how
|
||||||
# the committed model happens to label these bytes.
|
# the committed model happens to label these bytes.
|
||||||
CLASSIFIER[] = load_classifier(joinpath(@__DIR__, "..", "model", "classifier.jld2"))
|
CLASSIFIER[] = load_classifier(joinpath(@__DIR__, "..", "model", "classifier.jld2"))
|
||||||
@@ -660,7 +660,7 @@ end
|
|||||||
end
|
end
|
||||||
|
|
||||||
@testset "cluster: §10.1 discovers nothing from noise" begin
|
@testset "cluster: §10.1 discovers nothing from noise" begin
|
||||||
# 25 independent random blobs — the shape of data/binary (structureless
|
# 25 independent random blobs: the shape of data/binary (structureless
|
||||||
# junk). Correct output: ZERO promoted clusters (random headers never
|
# junk). Correct output: ZERO promoted clusters (random headers never
|
||||||
# form a ≥20-member, ≥3-magic-byte signature). See DESIGN §10.1.
|
# form a ≥20-member, ≥3-magic-byte signature). See DESIGN §10.1.
|
||||||
rng = MersenneTwister(20260703)
|
rng = MersenneTwister(20260703)
|
||||||
@@ -681,9 +681,9 @@ end
|
|||||||
@testset "cluster: §10.2 recovers known (synthetic) formats" begin
|
@testset "cluster: §10.2 recovers known (synthetic) formats" begin
|
||||||
# Four synthetic "formats": a fixed magic prefix + random tail, mirroring
|
# Four synthetic "formats": a fixed magic prefix + random tail, mirroring
|
||||||
# gzip/PDF/JPEG/ELF. Calibrated settings must recover them as clean,
|
# gzip/PDF/JPEG/ELF. Calibrated settings must recover them as clean,
|
||||||
# promotable clusters at high ARI — the magic-collapsed recovery of §10.2,
|
# promotable clusters at high ARI: the magic-collapsed recovery of §10.2,
|
||||||
# here with a hermetic, deterministic corpus.
|
# here with a hermetic, deterministic corpus.
|
||||||
# ~12-byte constant headers + random tails — the shape of a real file
|
# ~12-byte constant headers + random tails: the shape of a real file
|
||||||
# header (a fixed magic/version region, then variable content). A too-short
|
# header (a fixed magic/version region, then variable content). A too-short
|
||||||
# magic over a fully-random tail is adversarially hard and lets a format
|
# magic over a fully-random tail is adversarially hard and lets a format
|
||||||
# over-split; real headers anchor a cluster with ~12+ constant bytes.
|
# over-split; real headers anchor a cluster with ~12+ constant bytes.
|
||||||
@@ -713,7 +713,7 @@ end
|
|||||||
for (id, c) in r.clusters
|
for (id, c) in r.clusters
|
||||||
sig = signature(c)
|
sig = signature(c)
|
||||||
if is_promotable(c, sig; min_members=20, min_magic=3)
|
if is_promotable(c, sig; min_members=20, min_magic=3)
|
||||||
# ...and every nomination is PURE — the whole point of the human
|
# ...and every nomination is PURE. The whole point of the human
|
||||||
# gate is that we never hand it a garbage merged signature.
|
# gate is that we never hand it a garbage merged signature.
|
||||||
labels = unique(breakdown(id))
|
labels = unique(breakdown(id))
|
||||||
@test Base.length(labels) == 1
|
@test Base.length(labels) == 1
|
||||||
@@ -770,7 +770,7 @@ end
|
|||||||
@testset "recover_dir!: blocks on a full queue, recovers every file" begin
|
@testset "recover_dir!: blocks on a full queue, recovers every file" begin
|
||||||
# The regression this guards is data loss, not slowness. `spool/` now
|
# The regression this guards is data loss, not slowness. `spool/` now
|
||||||
# holds every in-flight file at every stage, so a crash under load leaves
|
# holds every in-flight file at every stage, so a crash under load leaves
|
||||||
# far more leftovers than one queue's capacity — and the old non-blocking
|
# far more leftovers than one queue's capacity, and the old non-blocking
|
||||||
# recovery warned and abandoned the excess, which is exactly the work
|
# recovery warned and abandoned the excess, which is exactly the work
|
||||||
# recovery exists to save. With the pool live, recovery must park until
|
# recovery exists to save. With the pool live, recovery must park until
|
||||||
# the consumer makes room and come back with all of it.
|
# the consumer makes room and come back with all of it.
|
||||||
@@ -887,7 +887,7 @@ end
|
|||||||
@test "match-01" in cat.processed
|
@test "match-01" in cat.processed
|
||||||
@test "blob-01" in cat.processed
|
@test "blob-01" in cat.processed
|
||||||
|
|
||||||
# Re-sweeping the same pile is idempotent — nothing new is seen.
|
# Re-sweeping the same pile is idempotent; nothing new is seen.
|
||||||
s2 = catalog_sweep!(cat, cfg)
|
s2 = catalog_sweep!(cat, cfg)
|
||||||
@test s2.n_seen == 0
|
@test s2.n_seen == 0
|
||||||
@test cat.clusters[1].members == 41
|
@test cat.clusters[1].members == 41
|
||||||
@@ -911,7 +911,7 @@ end
|
|||||||
r = run_cluster_sweep(cfg; rng=MersenneTwister(10))
|
r = run_cluster_sweep(cfg; rng=MersenneTwister(10))
|
||||||
@test r.mode == :compact
|
@test r.mode == :compact
|
||||||
@test isfile(cfg.cluster_catalog_path)
|
@test isfile(cfg.cluster_catalog_path)
|
||||||
# The mission-critical assertion: ZERO promoted clusters from pure noise.
|
# The assertion that matters: ZERO promoted clusters from pure noise.
|
||||||
@test r.n_nominated == 0
|
@test r.n_nominated == 0
|
||||||
@test isempty(readdir(cfg.nominated_dir))
|
@test isempty(readdir(cfg.nominated_dir))
|
||||||
# Every file was accounted for (clustered-as-singleton or background).
|
# Every file was accounted for (clustered-as-singleton or background).
|
||||||
@@ -923,13 +923,13 @@ end
|
|||||||
mktempdir() do root
|
mktempdir() do root
|
||||||
n = 32
|
n = 32
|
||||||
# β=0.1 over-splits a format into pure sub-clusters (DESIGN §11 known
|
# β=0.1 over-splits a format into pure sub-clusters (DESIGN §11 known
|
||||||
# limitation) — each still carries the full magic and nominates
|
# limitation). Each still carries the full magic and nominates
|
||||||
# independently, so a modest min_members catches those sub-clusters.
|
# independently, so a modest min_members catches those sub-clusters.
|
||||||
cfg = tmp_config(root; cluster_n=n, cluster_alpha=1.0,
|
cfg = tmp_config(root; cluster_n=n, cluster_alpha=1.0,
|
||||||
cluster_pseudocount=0.1, cluster_bg_mass=5.0,
|
cluster_pseudocount=0.1, cluster_bg_mass=5.0,
|
||||||
promote_min_members=10, promote_min_magic=3)
|
promote_min_members=10, promote_min_magic=3)
|
||||||
rng = MersenneTwister(21)
|
rng = MersenneTwister(21)
|
||||||
# 30 files sharing a fixed 6-byte magic then random payload — a format.
|
# 30 files sharing a fixed 6-byte magic then random payload: a format.
|
||||||
magic = UInt8[0x89, 0x46, 0x4d, 0x54, 0x21, 0x0a]
|
magic = UInt8[0x89, 0x46, 0x4d, 0x54, 0x21, 0x0a]
|
||||||
for i in 1:30
|
for i in 1:30
|
||||||
drop_binary(cfg.cluster_dir, vcat(magic, rand(rng, UInt8, 40)); name="fmt-$(lpad(i,2,'0'))")
|
drop_binary(cfg.cluster_dir, vcat(magic, rand(rng, UInt8, 40)); name="fmt-$(lpad(i,2,'0'))")
|
||||||
@@ -1029,7 +1029,7 @@ end
|
|||||||
@test stats.failed[] == 1
|
@test stats.failed[] == 1
|
||||||
@test stats.bytes[] == 30
|
@test stats.bytes[] == 30
|
||||||
# Each of the three handlers slept 20ms before its outcome, so
|
# Each of the three handlers slept 20ms before its outcome, so
|
||||||
# busy time covers the failure too — the work was done either way.
|
# busy time covers the failure too; the work was done either way.
|
||||||
@test stats.busy_ns[] > 3 * 15_000_000
|
@test stats.busy_ns[] > 3 * 15_000_000
|
||||||
@test stats.blocked_ns[] == 0 # nothing downstream to block on
|
@test stats.blocked_ns[] == 0 # nothing downstream to block on
|
||||||
@test stats.in_flight[] == 0 # the finally in worker_loop
|
@test stats.in_flight[] == 0 # the finally in worker_loop
|
||||||
@@ -1118,7 +1118,7 @@ end
|
|||||||
@test snap.intake.files == 9
|
@test snap.intake.files == 9
|
||||||
@test snap.uptime_seconds >= 0
|
@test snap.uptime_seconds >= 0
|
||||||
|
|
||||||
# It has to survive the trip through JSON — /stats is the only
|
# It has to survive the trip through JSON: /stats is the only
|
||||||
# consumer, and bin/bench.jl reads these exact field names.
|
# consumer, and bin/bench.jl reads these exact field names.
|
||||||
round_tripped = JSON3.read(JSON3.write(snap))
|
round_tripped = JSON3.read(JSON3.write(snap))
|
||||||
@test round_tripped.stages[2].busy_seconds ≈ 2.0
|
@test round_tripped.stages[2].busy_seconds ≈ 2.0
|
||||||
|
|||||||
Reference in New Issue
Block a user