Skip to content

DEL-2538: Add metric for commit conflicts in ingestor - #23

Closed
rishiraj-tf wants to merge 1 commit into
tf-0.32.4from
rishi/DEL-2538-commit-conflict-observer
Closed

rishiraj-tf wants to merge 1 commit into
tf-0.32.4from
rishi/DEL-2538-commit-conflict-observer

Conversation

@rishiraj-tf

@rishiraj-tf rishiraj-tf commented Oct 29, 2026 •

Copy link
Copy Markdown

Summary

  • Adds a process-wide commit-conflict observer to the tf-0.32.4 commit retry loop so callers can count conflicts without a Prometheus dependency in delta-rs.
  • The observer is notified on version-already-exists retries, successful conflict rebases (including the winning commit's operation), conflict aborts, and exhausted retry budgets. It is a no-op when unset.

Test plan

  • cargo test -p deltalake-core --lib installed_observer_counts_one_notification
  • Ingestor PR consumes this commit and checks df_delta_log_commit_conflict_total on /metrics

Made with Cursor


Note

Low Risk
Observability-only hooks on existing conflict/retry paths; commit behavior is unchanged when no observer is registered.

Reviewed by Cursor Bugbot for commit 754c915. Bugbot is set up for automated code reviews on this repo. Configure here.

The commit loop can report retries, rebases, aborts, and exhausted attempts
without taking a Prometheus dependency.

Co-authored-by: Cursor <cursoragent@cursor.com>
@github-actions

Copy link
Copy Markdown

ACTION NEEDED

delta-rs follows the Conventional Commits specification for release automation.

The PR title and description are used as the merge commit message. Please update your PR title and description to match the specification.

@rishiraj-tf rishiraj-tf changed the title DEL-2538: Notify observers when a delta log commit conflicts DEL-2565: Delta-rs : Notify observers when a delta log commit conflicts Oct 29, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using default effort and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 754c915. Configure here.

error,
});
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create-race conflict skips observer

Low Severity

A lost race on the initial version-0 put is a VersionAlreadyExists retry, but it never calls notify_commit_conflict. The handler still consumes an attempt and continues the retry loop, so table-creation conflicts are omitted from observer counts that the other version-already-exists path records.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 754c915. Configure here.

@rishiraj-tf rishiraj-tf changed the title DEL-2565: Delta-rs : Notify observers when a delta log commit conflicts DEL-2538: Add metric for commit conflicts in ingestor Oct 29, 2026
@rishiraj-tf rishiraj-tf closed this Nov 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant