Skip to content

[release-2.77] Cherry-pick RestrictionTrackers lock timeout fixes (#40205, #40251) - #40287

Merged
Amar3tto merged 2 commits into
apache:release-2.77from
damccorm:cp-40205-40251-release-2.77
Sep 29, 2026
Merged

Amar3tto merged 2 commits into
apache:release-2.77from
damccorm:cp-40205-40251-release-2.77

Conversation

@damccorm

Copy link
Copy Markdown
Contributor

Cherry-picks #40205 (a40d8cd9bd9) and #40251 (404bde62095) onto the release-2.77 branch to prevent long-running tryClaim calls from causing worker lease expirations due to lock contention in RestrictionTrackers.getProgress and RestrictionTrackers.trySplit.

….getProgress (apache#40205)

* Return last evaluated progress on lock timeout in RestrictionTrackers.getProgress

* Update progress before unlocking when needsProgressUpdate is set

* Unconditionally update progress after trySplit and rename unlock to updateProgressAndUnlock
…ion (apache#40251)

* Time out RestrictionTrackers.trySplit after 5 minutes on lock contention

* Block on lock.lock() when fractionOfRemainder == 0 in trySplit
@damccorm

Copy link
Copy Markdown
Contributor Author

R: @Abacn @Amar3tto

@github-actions

Copy link
Copy Markdown
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

@Abacn

Abacn commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

LGTM (cherry-picks are usually approved by release manager)

@Amar3tto
Amar3tto merged commit 34e08cf into apache:release-2.77 Sep 29, 2026
21 checks passed
@damccorm
damccorm deleted the cp-40205-40251-release-2.77 branch September 29, 2026 15:00
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.

3 participants