A claim lease is only meaningful on the replica that granted it. Every other replica's view of the holder's liveness is stale by up to one sync interval, so a reaper over there can revert a unit that is very much alive here. Until now the only defense was operator discipline: partition every supervisor's reclaim by label and hope nobody runs an unscoped sweep. Leases now record WHICH replica granted them (leases.granted_node, ignored migration 0016, stamped from config.NodeID(): BEADS_NODE_ID / node_id config, falling back to the hostname). bd reclaim skips a lease that positively names another replica — on both the snapshot SELECT and the per-row DELETE re-check — and names each skip on stderr, since silence there is indistinguishable from "nothing to recover" while a genuinely dead remote worker's unit sits in_progress forever. bd reclaim --any-replica is the operator escape hatch for a replica that is gone for good. The guard is deliberately fail-open on unknown provenance: granted_node '' (a row predating the column, or a deployment whose NodeID is empty) is treated as local, so the upgrade itself can never strand a stale lease the reaper could previously recover. A heartbeat backfills an unknown row with the local node and never overwrites a known one. The one path that can materialize a FOREIGN lease row locally is RestoreLeaseOnImportInTx — lease fields round-trip the JSONL interchange — so the granting replica rides types.Issue.LeaseGrantedNode and a restored lease keeps the replica the snapshot names, never this node. A snapshot from an older binary carries none, restores as unknown, and behaves exactly as before. What the guard cannot enforce is documented instead, in both bd reclaim --help and docs/multi-agent/federation.md: grace window > sync interval, and lease TTL > sync interval. A TTL shorter than the cadence at which replicas exchange state is meaningless across the bridge — the remote view is a full interval old by construction. doc/beads-upstream-asks.md section 5.
110 lines
4.8 KiB
Go
110 lines
4.8 KiB
Go
// Package sqlbuild holds the pure SQL-text builders shared by the classic
|
|
// issueops stack (production, *sql.Tx) and the domain/db repository stack
|
|
// (proxied-server, Runner). Functions here map (filter, tables) -> (sql, args)
|
|
// and are execution-context-free: no database handles, no transactions.
|
|
//
|
|
// Both stacks must produce identical row sets for identical filters (pinned
|
|
// by the Seam A parity suite in internal/storage/domain/db). Keeping the
|
|
// query text in one place is what prevents the two implementations from
|
|
// drifting; see bd-6dnrw.46 for the unify-vs-duplicate decision. Execution
|
|
// orchestration (issues+wisps merge strategy, hydration, probes) is
|
|
// intentionally NOT unified and stays in each stack.
|
|
package sqlbuild
|
|
|
|
import "strings"
|
|
|
|
// FilterTables configures table names for the filter builders, allowing the
|
|
// same filter logic to target both the issues and wisps table families.
|
|
type FilterTables struct {
|
|
Main string // "issues" or "wisps"
|
|
Labels string // "labels" or "wisp_labels"
|
|
Dependencies string // "dependencies" or "wisp_dependencies"
|
|
Comments string // "comments" or "wisp_comments"
|
|
}
|
|
|
|
var (
|
|
IssuesFilterTables = FilterTables{Main: "issues", Labels: "labels", Dependencies: "dependencies", Comments: "comments"}
|
|
WispsFilterTables = FilterTables{Main: "wisps", Labels: "wisp_labels", Dependencies: "wisp_dependencies", Comments: "wisp_comments"}
|
|
)
|
|
|
|
// DepTargetExpr resolves a dependency row's target across the three
|
|
// mutually-exclusive target columns.
|
|
const DepTargetExpr = "COALESCE(depends_on_issue_id, depends_on_wisp_id, depends_on_external)"
|
|
|
|
// IssueBaseColumns is the column list for the issues/wisps row itself,
|
|
// without the lease overlay. Use IssueSelectColumns for full hydration;
|
|
// this split exists so callers that alias the main table (QualifyColumns)
|
|
// can qualify the row columns without mangling the leases.* references.
|
|
const IssueBaseColumns = `id, content_hash, title, description, design, acceptance_criteria, notes,
|
|
status, priority, issue_type, assignee, estimated_minutes,
|
|
created_at, created_by, owner, updated_at, started_at, closed_at, external_ref, spec_id,
|
|
compaction_level, compacted_at, compacted_at_commit, original_size, source_repo, close_reason,
|
|
sender, ephemeral, no_history, wisp_type, pinned, is_template,
|
|
await_type, await_id, timeout_ns, waiters,
|
|
mol_type,
|
|
event_kind, actor, target, payload,
|
|
due_at, defer_until,
|
|
work_type, source_system, metadata, row_lock`
|
|
|
|
// LeaseSelectColumns is the lease overlay for full issue hydration. Leases
|
|
// live in the ephemeral leases table (bd-lrgn1), not on the issues row, so
|
|
// every query selecting these must also add LeaseJoin to its FROM clause —
|
|
// a query that forgets the join fails loudly on the leases.* reference.
|
|
const LeaseSelectColumns = `leases.lease_expires_at, leases.heartbeat_at, leases.granted_node`
|
|
|
|
// IssueSelectColumns is the canonical column list for full issue hydration.
|
|
// Every query that reads a complete types.Issue should use this constant
|
|
// and include LeaseJoin(table) in its FROM clause; the scan side is
|
|
// issueops.ScanIssueFrom, which scans positionally and must stay in
|
|
// column-for-column agreement with this list.
|
|
const IssueSelectColumns = IssueBaseColumns + `,
|
|
` + LeaseSelectColumns
|
|
|
|
// LeaseJoin returns the FROM-clause fragment that overlays the ephemeral
|
|
// leases table onto the given issues/wisps table reference (a table name or
|
|
// alias). LEFT JOIN: rows without a live claim have no lease row and hydrate
|
|
// nil lease fields.
|
|
func LeaseJoin(tableRef string) string {
|
|
return "LEFT JOIN leases ON leases.issue_id = " + tableRef + ".id"
|
|
}
|
|
|
|
// QueryBatchSize bounds IN-clause sizes when long ID lists are folded into
|
|
// WHERE fragments.
|
|
const QueryBatchSize = 200
|
|
|
|
// QualifyColumns prefixes every column in a comma-separated list (e.g.
|
|
// IssueSelectColumns) with the given table qualifier such as "i.".
|
|
func QualifyColumns(columns, prefix string) string {
|
|
raw := strings.ReplaceAll(columns, "\n", " ")
|
|
raw = strings.ReplaceAll(raw, "\t", " ")
|
|
parts := strings.Split(raw, ",")
|
|
for i, p := range parts {
|
|
parts[i] = prefix + strings.TrimSpace(p)
|
|
}
|
|
return strings.Join(parts, ", ")
|
|
}
|
|
|
|
// InPlaceholders renders "?,?,..." and the matching arg slice for an IN clause.
|
|
func InPlaceholders[T ~string](values []T) (string, []any) {
|
|
ph := make([]string, len(values))
|
|
args := make([]any, len(values))
|
|
for i, v := range values {
|
|
ph[i] = "?"
|
|
args[i] = string(v)
|
|
}
|
|
return strings.Join(ph, ","), args
|
|
}
|
|
|
|
// CompactNonEmptyStrings drops empty entries, returning nil when none remain.
|
|
func CompactNonEmptyStrings(values []string) []string {
|
|
if len(values) == 0 {
|
|
return nil
|
|
}
|
|
out := make([]string, 0, len(values))
|
|
for _, value := range values {
|
|
if value != "" {
|
|
out = append(out, value)
|
|
}
|
|
}
|
|
return out
|
|
}
|