Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions internal/telemetry/compaction_debt.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,13 @@ func (p *ParquetStore) changeGeneration0Locked(b BatchMetadata, delta int) {
}
}

// setBatchLocked is the sole live-catalog mutation. Replacement, restoration,
// rollback, startup and retention all use the same inventory accounting.
func (p *ParquetStore) setBatchLocked(id string, batch *storedBatch) {
// setBatchLockedNoPublish mutates the live catalog and its inventory accounting
// without republishing the reader snapshot or firing the debt gate. A caller
// that changes several batches as one logical step takes mu, calls this for
// each, then publishes once with publishBatchesLocked, so lock-free readers
// never observe an intermediate catalog. The generation-0 snapshot it stores is
// a backlog gauge, not query state, so leaving it per-mutation is harmless.
func (p *ParquetStore) setBatchLockedNoPublish(id string, batch *storedBatch) {
if old := p.batches[id]; old != nil {
p.changeGeneration0Locked(old.metadata, -1)
}
Expand All @@ -78,13 +82,27 @@ func (p *ParquetStore) setBatchLocked(id string, batch *storedBatch) {
p.changeGeneration0Locked(batch.metadata, 1)
}
p.generation0Snapshot.Store(int64(p.generation0Batches))
}

// publishBatchesLocked republishes the canonical reader snapshot and wakes a
// waiter once debt has crossed its limit. It is the single publish step that
// follows one or more setBatchLockedNoPublish mutations under mu.
func (p *ParquetStore) publishBatchesLocked() {
p.publishMetadataLocked()
if p.compactionDebt >= CompactionDebtLimit && p.debtLimitReached != nil {
close(p.debtLimitReached)
p.debtLimitReached = nil
}
}

// setBatchLocked is the sole single-batch live-catalog mutation. Commit,
// restoration, rollback, startup and retention all use the same inventory
// accounting and publish the new catalog atomically on every call.
func (p *ParquetStore) setBatchLocked(id string, batch *storedBatch) {
p.setBatchLockedNoPublish(id, batch)
p.publishBatchesLocked()
}

// WaitForCompactionLimit wakes higher-generation work when ingest needs the
// compactor. Registration and the threshold check share the catalog lock, so
// debt cannot cross the limit between the check and subscribing. No lock is
Expand Down
13 changes: 11 additions & 2 deletions internal/telemetry/parquet.go
Original file line number Diff line number Diff line change
Expand Up @@ -987,17 +987,26 @@ func (p *ParquetStore) PublishReplacement(stage string, metadata BatchMetadata,
// output is durable; until then marker recovery retries the fsync.
retired := make([]BatchMetadata, 0, len(inputs))
p.mu.Lock()
// Retire the inputs and install the output as one catalog edit. Each
// setBatchLocked would otherwise republish the snapshot per batch, and a
// lock-free reader that captured BatchMetadata between the input removals
// and the output install would build its file list from a catalog that
// has already lost a whole compaction group but not yet gained its
// replacement, under-counting rows that are conserved by the swap (#499).
for _, id := range inputs {
if batch, exists := p.batches[id]; exists {
retired = append(retired, batch.metadata)
}
p.setBatchLocked(id, nil)
p.setBatchLockedNoPublish(id, nil)
}
p.setBatchLocked(metadata.ID, replacement)
p.setBatchLockedNoPublish(metadata.ID, replacement)
// Whether or not the fsync succeeded, the output's replaces list now
// covers its inputs: a retried commit of one must neither adopt its
// directory nor write it again once it is deleted.
p.recordReplacesLocked(metadata.ID, inputs)
// A single publish exposes the pre-swap or post-swap catalog, never one
// of the intermediate states the per-batch mutations stepped through.
p.publishBatchesLocked()
p.mu.Unlock()
// Count catalog retirements once, even if marker cleanup or fsync is
// retried. Already absent inputs must not inflate retirement throughput.
Expand Down
Loading