Skip to content

allocator: disable follow-the-workload when MMA is enabled#167939

Merged
trunk-io[bot] merged 1 commit into
cockroachdb:masterfrom
angeladietz:mma-ftw
Apr 9, 2026
Merged

allocator: disable follow-the-workload when MMA is enabled#167939
trunk-io[bot] merged 1 commit into
cockroachdb:masterfrom
angeladietz:mma-ftw

Conversation

@angeladietz
Copy link
Copy Markdown
Contributor

Previously, follow-the-workload lease transfers via the lease queue were
still active when the MMA was enabled, potentially conflicting with its
rebalancing decisions. Now, shouldTransferLeaseForAccessLocality returns
early when the rebalancing mode is MMA, disabling follow-the-workload
while preserving lease preference enforcement, IO overload shedding, and
lease count convergence.

Fixes: #153866
Epic: CRDB-54644
Release note: None

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented Apr 8, 2026

😎 Merged successfully - details.

@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 8, 2026

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@angeladietz angeladietz requested a review from tbg April 8, 2026 17:21
@angeladietz angeladietz marked this pull request as ready for review April 8, 2026 18:08
@angeladietz angeladietz requested review from a team as code owners April 8, 2026 18:08
Previously, follow-the-workload lease transfers via the lease queue were
still active when the MMA was enabled, potentially conflicting with its
rebalancing decisions. Now, shouldTransferLeaseForAccessLocality returns
early when the rebalancing mode is MMA, disabling follow-the-workload
while preserving lease preference enforcement, IO overload shedding, and
lease count convergence.

Fixes: cockroachdb#153866
Epic: CRDB-54644
Release note: None
@angeladietz
Copy link
Copy Markdown
Contributor Author

/trunk merge

@angeladietz angeladietz force-pushed the mma-ftw branch 2 times, most recently from 9154765 to eae76e7 Compare April 9, 2026 14:44
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 9, 2026

Detected infrastructure failure (matched: self-hosted runner lost communication with the server). Automatically rerunning failed jobs. (run link)

@trunk-io trunk-io Bot merged commit 5ad7509 into cockroachdb:master Apr 9, 2026
55 of 58 checks passed
@angeladietz
Copy link
Copy Markdown
Contributor Author

blathers backport 26.2

@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 16, 2026

Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.


Issue #153866: branch-release-26.2.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

tbg added a commit to 5hubh4m/cockroach that referenced this pull request Apr 29, 2026
Triages 28 new author-based candidates as ignored: admission/AC SQL CPU
token workstream, SQL/UI/docs/CI changes, roachtest infra, and unrelated
kvserver/storage work. Also ignores cockroachdb#167861 (touches non-mma kvserver
load/allocator code), cockroachdb#167655 (test deflake), and cockroachdb#167696 (roachtest-only
scoring).

Leaves 4 PRs to backport: cockroachdb#167051, cockroachdb#167110 (asim configs/docs), cockroachdb#167897
(COCKROACH_DISABLE_MMA killswitch), cockroachdb#167939 (disable follow-the-workload
when MMA enabled).

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
tbg added a commit to 5hubh4m/cockroach that referenced this pull request Apr 29, 2026
…orted, invisible to script)

cockroachdb#167897 was cherry-picked manually (b5f0518, d3ea308, 5bae83c)
without backport-tool's PR-ref convention. cockroachdb#167939 was bundled into the
backport PR cockroachdb#168475 whose subject doesn't list the original PR number.

Both surfaced as conflicts during a backport run; verified the changes
are already on release-26.2.

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
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.

allocator: disable follow-the-workload lease transfers by default

3 participants