Skip to content

*: helper script for MMA backports to 26.2#165960

Draft
5hubh4m wants to merge 5 commits into
cockroachdb:masterfrom
5hubh4m:mma-backports-26.2
Draft

*: helper script for MMA backports to 26.2#165960
5hubh4m wants to merge 5 commits into
cockroachdb:masterfrom
5hubh4m:mma-backports-26.2

Conversation

@5hubh4m
Copy link
Copy Markdown
Contributor

@5hubh4m 5hubh4m commented Mar 17, 2026

No description provided.

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented Mar 17, 2026

Merging to master in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@5hubh4m 5hubh4m force-pushed the mma-backports-26.2 branch from d28ae3b to 56455fc Compare March 19, 2026 13:29
@cockroach-teamcity cockroach-teamcity added the X-perf-gain Microbenchmarks CI: Added if a performance gain is detected label Mar 19, 2026
@5hubh4m 5hubh4m force-pushed the mma-backports-26.2 branch from 56455fc to 89c35b2 Compare March 26, 2026 21:06
Comment thread scripts/mma-backports.txt Outdated
@5hubh4m 5hubh4m force-pushed the mma-backports-26.2 branch from 89c35b2 to 398f44f Compare April 2, 2026 13:40
tbg and others added 3 commits April 29, 2026 15:23
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>
…orted via cockroachdb#167468)

cockroachdb#167468 bundled them as "release-26.2: asim changes". Helper script's
get_backported_prs only sees PR numbers in commit subjects/bodies, and
the bundle's commits don't reference 167051/167110.

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
…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>
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 29, 2026

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

7 already backported via separate release PRs (cockroachdb#169344, cockroachdb#169590, cockroachdb#169711,
cockroachdb#169734, cockroachdb#169742, cockroachdb#169761, cockroachdb#169876) but invisible to script because the
cherry-picked commits don't reference the original PR number.

7 are unrelated to MMA (admission/AC, sql, kvserver/storage, ci,
roachtest/perturbation).

2 are master-and-onward only by intent: cockroachdb#169430 (enable MMA by default in
v26.3) and cockroachdb#169669 (retire load_based_lease_rebalancing setting).

Net: 0 PRs need backporting to release-26.2.

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented May 8, 2026

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

X-perf-gain Microbenchmarks CI: Added if a performance gain is detected

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants