Skip to content

[slack-22.0]: Merge upstream v22.0.3#789

Merged
tanjinx merged 166 commits intoslack-22.0from
merge-upstream-v22.0.3
Feb 5, 2026
Merged

[slack-22.0]: Merge upstream v22.0.3#789
tanjinx merged 166 commits intoslack-22.0from
merge-upstream-v22.0.3

Conversation

@tanjinx
Copy link
Copy Markdown

@tanjinx tanjinx commented Feb 4, 2026

Description

https://github.com/vitessio/vitess/compare/v22.0.2...v22.0.3?diff=unified&w
merge https://github.com/vitessio/vitess/releases/tag/v22.0.3

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

Deployment Notes

AI Disclosure

vitess-bot and others added 30 commits May 5, 2025 07:08
…vitessio#18225)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
…er (vitessio#18216) (vitessio#18220)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
…ic aggregation (vitessio#18073) (vitessio#18231)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Signed-off-by: Mohamed Hamza <mhamza15@github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Mohamed Hamza <mhamza15@github.com>
vitessio#18242) (vitessio#18250)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…tessio#18237) (vitessio#18245)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>
…8254) (vitessio#18258)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…#11379 (vitessio#18260) (vitessio#18263)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
…statements (vitessio#18279) (vitessio#18293)

Signed-off-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…tessio#18290)

Signed-off-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: frouioui <frouioui@users.noreply.github.com>
Co-authored-by: Andres Taylor <andres@planetscale.com>
…ming tables and log it (vitessio#18313) (vitessio#18316)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…vitessio#18345)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
…vitessio#18361) (vitessio#18363)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Andres Taylor <andres@planetscale.com>
…tor. (vitessio#18359) (vitessio#18368)

Signed-off-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: frouioui <frouioui@users.noreply.github.com>
Co-authored-by: Manan Gupta <manan@planetscale.com>
…tore=true (vitessio#18310) (vitessio#18356)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…Migrate test. (vitessio#18300) (vitessio#18334)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…18223) (vitessio#18322)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Signed-off-by: Manan Gupta <manan@planetscale.com>
Signed-off-by: Manan Gupta <manan@planetscale.com>
…vitessio#18380)

Signed-off-by: Manan Gupta <manan@planetscale.com>
…ssio#18390) (vitessio#18398)

Signed-off-by: siddharth16396 <siddharth16396@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…itessio#18414) (vitessio#18420)

Signed-off-by: siddharth16396 <siddharth16396@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…failure (vitessio#18428) (vitessio#18437)

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com>
…SQL stalls (vitessio#17883) (vitessio#18454)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
…em passing (vitessio#18407) (vitessio#18410)

Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
…uenceTables request (vitessio#18415) (vitessio#18445)

Signed-off-by: Noble Mittal <noblemittal@outlook.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Noble Mittal <noblemittal@outlook.com>
vitessio#18465)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>
…ecord (vitessio#18478) (vitessio#18483)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
tanjinx and others added 16 commits February 4, 2026 15:52
Restored query_executor.go and query_executor_test.go to their state before
the v22.0.3 merge to preserve Slack-specific customizations and avoid
compatibility issues with upstream changes.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Restored vstream_manager.go and vstream_manager_test.go to their state before
the v22.0.3 merge to preserve critical Slack-specific features:

- Transaction chunking to prevent OOM (Out Of Memory) issues with large transactions
- Stream liveness monitoring to detect dead streams
- Enhanced metrics (vstreamsTransactionsChunked counter)
- Detailed VStream flags logging for debugging

These features were added to improve reliability and observability of VStream
operations and should not be lost in the merge.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Reverted go/pools/smartconnpool/waitlist.go to pre-merge version and removed
the new semaphore implementation files (sema.s, sema_norace.go, sema_race.go).

The upstream changes replaced the channel-based waiter implementation with a
semaphore-based approach. Reverting to preserve the Slack version's channel
implementation.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Updated all 16 upgrade_downgrade test workflows with:
- runs-on: vitess-ubuntu24-16cpu-1 (Slack's custom runner)
- GOPRIVATE and GH_ACCESS_TOKEN environment variables
- GitHub access token setup step before Set up python

This ensures proper access to private Slack repositories during CI.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Reverted 7 workflow files to their state before the v22.0.3 merge to preserve
Slack-specific configurations that were present in the original version:

- upgrade_downgrade_test_backups_e2e.yml
- upgrade_downgrade_test_backups_e2e_next_release.yml
- upgrade_downgrade_test_backups_manual_next_release.yml
- upgrade_downgrade_test_query_serving_queries_next_release.yml
- upgrade_downgrade_test_query_serving_queries_2_next_release.yml
- upgrade_downgrade_test_query_serving_schema_next_release.yml
- upgrade_downgrade_test_reparent_new_vtctl.yml

These files had custom configurations that need to be maintained in the Slack fork.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
…version

Reverted .github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml to its
state before the v22.0.3 merge to preserve Slack-specific configurations.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Replaced upstream CODEOWNERS with Slack-specific version that assigns
all files to @slackhq/vitess-approvers.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Reverted go/test/endtoend/vreplication/vstream_test.go to its state before
the v22.0.3 merge to preserve Slack-specific test configurations.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Reverted docker/lite/Dockerfile.mysql84 and docker/lite/Dockerfile.percona80
to their state before the v22.0.3 merge to preserve Slack-specific configurations:

- Use golang:1.24.10-bookworm (without SHA pinning)
- Use debian:bookworm-slim (without SHA pinning)
- Restore GH_ACCESS_TOKEN setup for private repository access
- Restore GOPRIVATE environment variable for github.com/slackhq/vitess-addons

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Restore GitHub access token and GOPRIVATE settings needed for accessing
Slack's private vitess-addons repository during Docker builds.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Remove duplicate test entry that was missing the Packages field and causing
'ERROR: PACKAGES is empty' test failures. Merged RetryMax field from the
duplicate into the correct entry.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Remove duplicate entries for vtgate_foreignkey_routing and
vreplication_sequence_reset_on_switch_traffic that were missing
the Packages field. Merged RetryMax field from duplicates.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Feb 5, 2026

Codecov Report

❌ Patch coverage is 72.80702% with 124 lines in your changes missing coverage. Please review.
✅ Project coverage is 69.78%. Comparing base (3a6de8d) to head (9350469).
⚠️ Report is 7 commits behind head on slack-22.0.

Files with missing lines Patch % Lines
go/vt/vtorc/logic/topology_recovery.go 0.00% 43 Missing ⚠️
go/tools/go-upgrade/go-upgrade.go 0.00% 23 Missing ⚠️
go/vt/mysqlctl/replication.go 0.00% 15 Missing ⚠️
go/vt/vttablet/tabletmanager/rpc_replication.go 37.50% 10 Missing ⚠️
go/vt/vtgate/evalengine/compiler_asm.go 81.81% 8 Missing ⚠️
go/mysql/binlog/binlog_json.go 77.27% 5 Missing ⚠️
go/vt/vtgate/evalengine/fn_json.go 84.37% 5 Missing ⚠️
go/vt/vtorc/inst/instance_dao.go 78.94% 4 Missing ⚠️
.../vttablet/tabletmanager/semisyncmonitor/monitor.go 93.65% 4 Missing ⚠️
go/vt/vtcombo/tablet_map.go 0.00% 2 Missing ⚠️
... and 4 more
Additional details and impacted files
@@              Coverage Diff               @@
##           slack-22.0     #789      +/-   ##
==============================================
+ Coverage       69.76%   69.78%   +0.02%     
==============================================
  Files            1605     1605              
  Lines          213689   213999     +310     
==============================================
+ Hits           149081   149342     +261     
- Misses          64608    64657      +49     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

tanjinx and others added 10 commits February 4, 2026 21:30
Add branches-ignore pattern to exclude slack-[0-9]+.[0-9] branches from
MySQL 5.7 unit test workflows since Slack no longer supports MySQL 5.7.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Three workflow files were missing the 'env:' keyword before their
environment variable declarations, causing the workflows to be invalid
and preventing tests from running.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Change from oracle-vm-8cpu-32gb-x86-64 to vitess-ubuntu24-16cpu-1
to align with other workflows in the repository.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
The Setup GitHub access token step was checking for 'end_to_end' filter
output, but the paths-filter only defines 'examples'. This mismatch caused
the step to be skipped, preventing authentication for downloading the
private vitess-addons module.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Add GOPRIVATE and GH_ACCESS_TOKEN environment variables, and add the
Setup GitHub access token step to authenticate for downloading the
private vitess-addons module.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
The vtop_example test builds a Docker image using docker/lite/Dockerfile,
which needs to authenticate to download the private vitess-addons module.
Pass GH_ACCESS_TOKEN as a build argument so the Dockerfile can configure
git authentication.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
The bootstrap Docker image is used for Java tests and needs to authenticate
to download the private vitess-addons module during go mod download.
Add GH_ACCESS_TOKEN build arg handling and git config setup.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Change from ubuntu-24.04 to vitess-ubuntu24-16cpu-1 runner.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Upgrade github.com/slackhq/vitess-addons from v0.22.1 to v0.22.3.
The new version implements HasSemiSync() directly in SlackCrossCell,
so the slackCrossCellWrapper is no longer needed.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
@tanjinx tanjinx merged commit e3f4453 into slack-22.0 Feb 5, 2026
92 of 95 checks passed
@tanjinx tanjinx deleted the merge-upstream-v22.0.3 branch February 5, 2026 22:27
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.

9 participants