mirror of
https://github.com/penpot/penpot.git
synced 2026-11-05 01:20:38 +00:00
* 🎉 Move backend jobs to the unified job table substrate Replace the generic 'task' table with a unified 'job' table as the durable substrate for all backend jobs, and migrate every producer and consumer to it. The legacy 'task' table stops receiving writes but stays dormant (still cleaned by tasks-gc); upload-session chunking and the other post-branch upstream changes are preserved. New 0154 migration creates the 'job' table: dispatch and lifecycle columns (name, queue, priority, scheduled_at, retries, status, timestamps, props) plus optional user-facing ledger columns (profile_id, target, progress, error, result, resource_id, expires_at). No modified_at trigger: the application updates it on every write for lease and orphan detection. Partial indexes cover the dispatcher claim query, orphan scanning, and per-profile listing. New app.jobs public API: submit!/invoke!, heartbeats and progress reporting, a precompiled job-def registry (name, schema, handler, decoder, validator), an ephemeral request/response mode, and a management API for external workers. The dispatcher claims new/retry rows (FOR UPDATE SKIP LOCKED) with a plain JSON redis payload and marks lease-expired running rows as orphaned; the runner executes per-queue with the same retry conventions. New jobs GC (daily): deletes expired rows and retains internal terminal rows per :jobs-retention, touching referenced storage objects so storage-gc-touched reclaims them. Job resources live in a dedicated job-resource bucket with a reclaim branch in storage-gc-touched. All production call-sites (sendmail, delete-object, demo-purge, file-gc, offload, webhooks, quotes, nitrate bulk delete, snapshots, telemetry) and the ten cron tasks now submit through app.jobs; cron is a pure scheduler and the legacy worker registry, task-table inserts, and per-namespace handlers are removed. Includes migrations, dispatcher, runner, jobs, request/response, jobs GC, management API, and cron test suites. AI-assisted-by: glm-5.3-flash AI-assisted-by: muse-spark-1.3-contributor AI-assisted-by: kimi-k3 AI-assisted-by: mimo-v2.5 * ✨ Address review comments on jobs substrate Resolves the four open review threads on the jobs PR. Orphaned jobs are now marked aborted, a system-side terminal state with no retry: the dispatcher sweep stores the end event with outcome aborted in a single bulk insert in the same transaction, records the terminal outcome next to the orphaned counter, and reports an error log; orphans keep alerting through the log and the counter, with no user notification. The aborted state is terminal everywhere: the status CHECK, the sweep, the lifecycle writers, the jobs GC retention, the backlog gauges and the user status mapping, with tests covering each transition. The claim comment, the 2.20 doc version and the legacy task table notes are corrected, and objects-gc heartbeats per chunk. AI-assisted-by: muse-spark-1.3-contributor
156 lines
5.6 KiB
Clojure
156 lines
5.6 KiB
Clojure
;; This Source Code Form is subject to the terms of the Mozilla Public
|
|
;; License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
;;
|
|
;; Copyright (c) KALEIDOS SUBSIDIARY SL
|
|
|
|
(ns app.storage.schema
|
|
"Schema, validation and encode/decode helpers for
|
|
`storage_object.metadata`.
|
|
|
|
Phase 1: reads accept both the legacy Transit encoding and plain
|
|
JSON (sniffed by the `\"~:` marker); writes validate + normalize
|
|
but still serialize as Transit unless the
|
|
`:storage-metadata-as-json` config flag is set."
|
|
(:require
|
|
[app.common.data :as d]
|
|
[app.common.exceptions :as ex]
|
|
[app.common.schema :as sm]
|
|
[app.config :as cf]
|
|
[app.db :as db]
|
|
[cuerdas.core :as str])
|
|
(:import
|
|
org.postgresql.util.PGobject))
|
|
|
|
(def default-bucket
|
|
"file-media-object")
|
|
|
|
(def tempfile-bucket
|
|
"Bucket name for temporary file uploads (10-minute expiry)."
|
|
"tempfile")
|
|
|
|
(def upload-session-bucket
|
|
"Bucket name for chunked-upload chunks."
|
|
"upload-session")
|
|
|
|
(def job-resource-bucket
|
|
"Bucket name for storage objects owned by a job row
|
|
(`job.resource_id`)."
|
|
"job-resource")
|
|
|
|
(def bucket-requirements
|
|
"Canonical buckets and the extra keys each one must carry, so a new
|
|
bucket and its contract live in one place. Listed keys are declared as
|
|
optional in `schema:metadata` and only checked for presence; their type
|
|
is enforced by the map. Only buckets whose keys are read somewhere need
|
|
an entry: `file-data` ids are resolved by the GC, `organization-id` is
|
|
the logo's owner."
|
|
{"file-media-object" #{}
|
|
"team-font-variant" #{}
|
|
"file-object-thumbnail" #{}
|
|
"file-thumbnail" #{}
|
|
"profile" #{}
|
|
"organization" #{:organization-id}
|
|
tempfile-bucket #{}
|
|
upload-session-bucket #{}
|
|
job-resource-bucket #{}
|
|
"file-data" #{:file-id :id}
|
|
"file-data-fragment" #{}
|
|
"file-change" #{}})
|
|
|
|
(def metadata-buckets
|
|
"Canonical bucket set. `app.storage/valid-buckets` aliases it so the
|
|
list lives in exactly one place."
|
|
(set (keys bucket-requirements)))
|
|
|
|
(defn- bucket-requirements-present?
|
|
[{:keys [bucket] :as mdata}]
|
|
(every? #(some? (get mdata %)) (get bucket-requirements bucket #{})))
|
|
|
|
(def schema:metadata
|
|
"Closed schema for `storage_object.metadata`. A single shape shared by
|
|
every bucket: `:bucket` is checked against `metadata-buckets` and the
|
|
rest are typed optional keys. `bucket-requirements` adds the per-bucket
|
|
presence checks."
|
|
[:and
|
|
[:map {:closed true}
|
|
[:bucket [::sm/one-of {:format :string} metadata-buckets]]
|
|
[:content-type :string]
|
|
[:hash {:optional true} :string]
|
|
[:profile-id {:optional true} ::sm/uuid]
|
|
[:organization-id {:optional true} ::sm/uuid]
|
|
[:file-id {:optional true} ::sm/uuid]
|
|
[:id {:optional true} ::sm/uuid]]
|
|
[:fn {:error/message "storage metadata is missing a required key for its bucket"}
|
|
bucket-requirements-present?]])
|
|
|
|
(defn- ->bucket
|
|
[v]
|
|
(cond
|
|
(string? v) v
|
|
(keyword? v) (d/name v)
|
|
:else (str v)))
|
|
|
|
(defn- normalize-metadata
|
|
"Bring decoded (or incoming) metadata to its canonical shape:
|
|
`:bucket` is always present (`:reference` is mapped to it, keyword
|
|
or string, and defaults to `default-bucket`), and the legacy
|
|
`:reference`, `:upload-id` and `:chunk-index` keys are dropped."
|
|
[mdata]
|
|
(let [bucket (or (not-empty (->bucket (:bucket mdata)))
|
|
(not-empty (->bucket (:reference mdata)))
|
|
default-bucket)]
|
|
(-> mdata
|
|
(dissoc :reference :upload-id :chunk-index)
|
|
(assoc :bucket bucket))))
|
|
|
|
;; Decoder and encoder are built once per process: creating them
|
|
;; compiles the closed schema, and `decode-metadata` runs on every read
|
|
;; path (get-object, dedup probes, GC batches).
|
|
(def ^:private decode-metadata-fn
|
|
(sm/decode-fn schema:metadata (sm/json-transformer)))
|
|
|
|
(def ^:private encode-metadata-fn
|
|
(sm/encoder schema:metadata (sm/json-transformer)))
|
|
|
|
(defn- transit-encoded?
|
|
"Legacy metadata is Transit json-verbose, where every top-level key is
|
|
a keyword, so the document starts with `{\"~:`. Anchoring the check to
|
|
the start avoids reading a plain-JSON document as Transit just because
|
|
one of its values contains `\"~:`."
|
|
[value]
|
|
(and (string? value)
|
|
(str/starts-with? (str/trim value) "{\"~:")))
|
|
|
|
(defn decode-metadata
|
|
"Decode storage metadata from a PGobject, accepting both the legacy
|
|
Transit encoding (sniffed by the `\"~:` marker) and plain JSON.
|
|
Always returns the normalized shape with id fields as UUIDs."
|
|
[o]
|
|
(when (some? o)
|
|
(let [raw (if (transit-encoded? (.getValue ^PGobject o))
|
|
(db/decode-transit-pgobject o)
|
|
(db/decode-json-pgobject o))]
|
|
(when-not (map? raw)
|
|
(ex/raise :type :internal
|
|
:code :invalid-storage-metadata
|
|
:hint "expected a map on storage object metadata"))
|
|
(decode-metadata-fn (normalize-metadata raw)))))
|
|
|
|
(def ^:private check-metadata
|
|
(sm/check-fn schema:metadata
|
|
:hint "invalid storage object metadata"
|
|
:type :validation
|
|
:code :invalid-storage-metadata))
|
|
|
|
(defn encode-metadata
|
|
"Validate, normalize and encode storage metadata into a PGobject
|
|
ready for the `metadata` column. Serializes as Transit while the
|
|
`:storage-metadata-as-json` config flag is unset, as plain JSON
|
|
when it is set."
|
|
[mdata]
|
|
(let [mdata (check-metadata (normalize-metadata mdata))]
|
|
(if (cf/get :storage-metadata-as-json)
|
|
(db/json (encode-metadata-fn mdata))
|
|
(db/tjson mdata))))
|