Skip to content

Comments

[slack-22.0] Merge upstream v22.0.2#772

Merged
tanjinx merged 104 commits intoslack-22.0from
merge-v22.0.2
Jan 20, 2026
Merged

[slack-22.0] Merge upstream v22.0.2#772
tanjinx merged 104 commits intoslack-22.0from
merge-v22.0.2

Conversation

@tanjinx
Copy link

@tanjinx tanjinx commented Jan 15, 2026

Description

Merge with upstream tag v22.0.2

https://github.com/vitessio/vitess/compare/v22.0.1...v22.0.2?diff=unified&w

all commits in v22.0.2 (since 22.0.1): https://github.com/vitessio/vitess/commits/v22.0.2
all commits in release-22.0: https://github.com/vitessio/vitess/commits/release-22.0

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>
@salesforce-cla
Copy link

Thanks for the contribution! Before we can merge this, we need @vitess-bot @GuptaManan100 to sign the Salesforce Inc. Contributor License Agreement.

@github-actions github-actions bot added this to the v22.0.1 milestone Jan 15, 2026
tanjinx and others added 9 commits January 15, 2026 14:26
After merging upstream v22.0.2, the semaphore type was undefined because
sema_norace.go was not included in the merge. This fixes the compilation
error by replacing semaphore-based synchronization with channels, eliminating
the dependency on Go runtime internals.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
The containerd/cgroups v1.1.0 package has type incompatibilities with
Go 1.24, causing build failures with errors like "invalid operation:
resources.Pids.Limit > 0 (mismatched types *int64 and untyped int)".

Updated metrics_cgroup.go to use cgroups v3 API, which is compatible
with Go 1.24 and provides the same functionality.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Removed the check that restricted CI workflows to only run on
slack-[0-9]+\.[0-9] branch pattern. Now workflows will run on all
branch pushes (except those handled by PR/main/tag logic).

This allows feature branches like merge-v22.0.2 to trigger CI tests
without needing to match the slack-* naming pattern.

Modified templates:
- test/templates/unit_test.tpl
- test/templates/cluster_vitess_tester.tpl
- test/templates/cluster_endtoend_test.tpl
- test/templates/cluster_endtoend_test_mysql57.tpl
- test/templates/cluster_endtoend_test_docker.tpl

Regenerated 66 workflow files from templates.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Completely removed the "Check if workflow needs to be skipped" step from
all workflow templates. Workflows will now run on all pushes and pull
requests, only gated by the "Skip CI" label check and the paths-filter
for relevant file changes.

This simplifies the workflow logic by removing branch-based skip
conditions, allowing all branches to trigger CI tests.

Modified templates:
- test/templates/unit_test.tpl
- test/templates/cluster_vitess_tester.tpl
- test/templates/cluster_endtoend_test.tpl
- test/templates/cluster_endtoend_test_mysql57.tpl
- test/templates/cluster_endtoend_test_docker.tpl

Regenerated 21 workflow files from templates.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Removed the slack-[0-9]+\.[0-9]$ branch pattern check from all
hand-written (non-generated) workflow files. This completes the
removal of slack branch restrictions across all CI workflows.

Modified 30 hand-written workflow files including:
- e2e_race.yml
- endtoend.yml
- unit_race*.yml
- upgrade_downgrade_test_*.yml
- vtadmin_web_*.yml
- *_example.yml workflows
- and others

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Completely removed the "Check if workflow needs to be skipped" step
from all 75 remaining workflow files. All workflows now execute on
every push and pull request, with only two gates:

1. "Skip CI" label check (for PRs)
2. paths-filter checks (only run when relevant files change)

This removes all branch-based skip logic, allowing CI to run on all
branches including feature branches like merge-v22.0.2.

Modified workflows include:
- All generated workflows (cluster_endtoend_*, unit_test_*, etc.)
- Hand-written workflows (e2e_race, endtoend, unit_race, etc.)
- Upgrade/downgrade test workflows
- VTAdmin workflows
- Example workflows

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Applied the upstream simplification from commit 6d30034 that uses
GitHub's native trigger filtering instead of skip-workflow logic:

- Pushes only trigger on main and release-* branches
- All pull requests trigger workflows
- All tags trigger workflows

This prevents duplicate workflow runs when pushing to PR branches
while ensuring CI runs on all pull requests.

Modified:
- 5 workflow templates
- 76 workflow files (66 generated + hand-written files)

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Previously these workflows triggered on all push and pull_request
events without branch filtering, causing duplicate runs.

Added branch filters to match the pattern used in other workflows:
- push: only on main, release-* branches, and all tags
- pull_request: on all branches

This prevents duplicate workflow runs while ensuring tests still
run on relevant branches.

Fixes duplicate runs reported for upgrade_downgrade_test_backups_e2e_next_release.yml
and 15 other upgrade_downgrade_test_*.yml workflows.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Add configuration to support accessing private GitHub repositories
during Docker builds, specifically for github.com/slackhq/vitess-addons.

Changes:
- Set GOPRIVATE environment variable after PATH configuration
- Add GH_ACCESS_TOKEN build argument and environment variable
- Configure git to use access token for GitHub authentication

This enables building Docker images that depend on private Slack
repositories by passing --build-arg GH_ACCESS_TOKEN=<token> to
docker build commands.

Modified files:
- docker/bootstrap/Dockerfile.common
- docker/lite/Dockerfile
- docker/lite/Dockerfile.mysql84
- docker/lite/Dockerfile.percona80
- docker/vttestserver/Dockerfile.mysql80
- docker/vttestserver/Dockerfile.mysql84

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

codecov-commenter commented Jan 16, 2026

Codecov Report

❌ Patch coverage is 66.98113% with 35 lines in your changes missing coverage. Please review.
✅ Project coverage is 69.75%. Comparing base (b1ab347) to head (86f833e).
⚠️ Report is 21 commits behind head on slack-22.0.

Files with missing lines Patch % Lines
go/vt/mysqlctl/builtinbackupengine.go 73.58% 14 Missing ⚠️
.../command/vreplication/lookupvindex/lookupvindex.go 0.00% 7 Missing ⚠️
go/cmd/vtctldclient/command/permissions.go 54.54% 5 Missing ⚠️
go/vt/mysqlctl/filebackupstorage/file.go 73.33% 4 Missing ⚠️
go/vt/mysqlctl/gcsbackupstorage/gcs.go 0.00% 3 Missing ⚠️
go/fileutil/join.go 85.71% 2 Missing ⚠️
Additional details and impacted files
@@              Coverage Diff               @@
##           slack-22.0     #772      +/-   ##
==============================================
+ Coverage       67.53%   69.75%   +2.22%     
==============================================
  Files            1600     1605       +5     
  Lines          261782   213548   -48234     
==============================================
- Hits           176786   148960   -27826     
+ Misses          84996    64588   -20408     

☔ 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 13 commits January 15, 2026 17:08
Re-add GOPRIVATE and GH_ACCESS_TOKEN configuration that was lost
during the v22.0.2 merge. This configuration allows Go to access
the private github.com/slackhq/vitess-addons repository.

The merge resolution chose upstream's Go version (1.24.9) but
inadvertently dropped Slack's private repo setup that existed
before the merge.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Regenerate all proto files to match the current tooling versions
after the v22.0.2 merge. The main changes are:
- protoc-gen-go version: v1.36.6 to v1.36.5
- Output format: string concatenation to byte array format

These changes are cosmetic and do not affect functionality.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Add proper branch filtering to prevent duplicate workflow runs.

Changed from unfiltered list-style triggers:
  - pull_request
  - push

To filtered object-style triggers:
  push:
    branches: [main, release-*]
    tags: all
  pull_request:
    branches: all

This matches the pattern used in other workflows and prevents
the workflow from running twice (once for push, once for PR).

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
…rade tests. (vitessio#18920) (vitessio#18955)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
# Conflicts:
#	.github/workflows/upgrade_downgrade_test_backups_e2e.yml
#	.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml
#	.github/workflows/upgrade_downgrade_test_backups_manual.yml
#	.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml
#	.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml
#	.github/workflows/upgrade_downgrade_test_query_serving_queries.yml
#	.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml
#	.github/workflows/upgrade_downgrade_test_query_serving_queries_2_next_release.yml
#	.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml
#	.github/workflows/upgrade_downgrade_test_query_serving_schema.yml
#	.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml
#	.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml
#	.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml
#	.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml
#	.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml
#	.github/workflows/upgrade_downgrade_test_semi_sync.yml
)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: frouioui <35779988+frouioui@users.noreply.github.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>
Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
…vitessio#19021)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
# Conflicts:
#	.github/workflows/unit_test_evalengine_mysql57.yml
#	.github/workflows/unit_test_mysql57.yml
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Add branches-ignore filter to skip upgrade_downgrade_*_next_release
workflow tests when PRs target slack-[0-9]+.[0-9] branches. These
tests compare against the next upstream release which doesn't apply
to Slack-specific release branches.

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

Add GOPRIVATE and GH_ACCESS_TOKEN environment variables and Setup
GitHub access token step to all upgrade_downgrade test workflows that
were missing them. This ensures consistent access to private Slack
repositories across all test workflows.

Files updated:
- upgrade_downgrade_test_backups_e2e.yml
- upgrade_downgrade_test_backups_manual.yml
- upgrade_downgrade_test_backups_manual_next_release.yml
- upgrade_downgrade_test_onlineddl_flow.yml
- upgrade_downgrade_test_query_serving_queries.yml
- upgrade_downgrade_test_query_serving_queries_2.yml
- upgrade_downgrade_test_query_serving_schema.yml
- upgrade_downgrade_test_reparent_old_vtctl.yml
- upgrade_downgrade_test_reparent_old_vttablet.yml
- upgrade_downgrade_test_semi_sync.yml

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>
Add branches-ignore filter to skip upgrade_downgrade_test_reparent_new_*
workflow tests when PRs target slack-[0-9]+.[0-9] branches. These tests
compare against the next upstream release which doesn't apply to
Slack-specific release branches.

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>
Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
@tanjinx tanjinx added the v22 label Jan 17, 2026
@tanjinx tanjinx merged commit 79f97fb into slack-22.0 Jan 20, 2026
90 of 93 checks passed
@tanjinx tanjinx deleted the merge-v22.0.2 branch January 20, 2026 21:24
sbaker617 pushed a commit that referenced this pull request Feb 5, 2026
* [release-22.0] Bump to `v22.0.1-SNAPSHOT` after the `v22.0.0` release (vitessio#18225)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>

* [release-22.0] fix: Preserve multi-column TupleExpr in tuple simplifier (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>

* [release-22.0] Properly handle grpc dial errors in the throttler metric 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>

* [release-22.0] test: TestQueryTimeoutWithShardTargeting fix flaky test (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>

* [release-22.0] make sure to give MEMBER OF the correct precedence (vitessio#18237) (vitessio#18245)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>

* [release-22.0] Fix evalengine crashes on unexpected types (vitessio#18254) (vitessio#18258)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Fix subquery merging regression introduced in vitessio#11379 (vitessio#18260) (vitessio#18263)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>

* [release-22.0] json array insert test (vitessio#18284) (vitessio#18286)

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>

* [release-22.0] Fix `SET` and `START TRANSACTION` in create procedure 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>

* [release-22.0] Fix deadlock in semi-sync monitor (vitessio#18276) (vitessio#18290)

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

* [release-22.0] Upgrade the Golang version to `go1.24.3` (vitessio#18239)

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>

* [release-22.0] Atomic Copy: Handle error that was ignored while streaming 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>

* [release-22.0] fix: handle dml query for None opcode (vitessio#18326) (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>

* [release-22.0] fix: keep LIMIT/OFFSET even when merging UNION queries (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>

* [release-22.0] Fix: Deadlock in `Close` and `write` in semi-sync monitor. (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>

* [release-22.0] Upgrade the Golang version to `go1.24.4` (vitessio#18329)

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>

* [release-22.0] fix version issue when using --mysql-shell-speedup-restore=true (vitessio#18310) (vitessio#18356)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Split workflow with flaky vdiff2 e2e test. Skip flaky 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>

* [release-22.0] Throttler: keep watching topo even on error (vitessio#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>

* [release-22.0] Code Freeze for `v22.0.1` (vitessio#18374)

Signed-off-by: Manan Gupta <manan@planetscale.com>

* [release-22.0] Release of `v22.0.1` (vitessio#18375)

Signed-off-by: Manan Gupta <manan@planetscale.com>

* [release-22.0] Bump to `v22.0.2-SNAPSHOT` after the `v22.0.1` release (vitessio#18380)

Signed-off-by: Manan Gupta <manan@planetscale.com>

* [release-22.0] [Bugfix] Broken Heartbeat system in Row Streamer (vitessio#18390) (vitessio#18398)

Signed-off-by: siddharth16396 <siddharth16396@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] test: Fix race condition in TestStreamRowsHeartbeat (vitessio#18414) (vitessio#18420)

Signed-off-by: siddharth16396 <siddharth16396@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Online DDL: resume vreplication after cut-over/RENAME 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>

* [release-22.0] Fix `vttablet` not being marked as not serving when MySQL 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>

* [release-22.0] Topo: Add NamedLock test for zk2 and consul and get them 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>

* [release-22.0] Reset in-memory sequence info on vttablet on UpdateSequenceTables 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>

* [release-22.0] bugfix: Fix impossible query for UNION (vitessio#18463) (vitessio#18465)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>

* [release-22.0] VReplication: Fix bug while reading _vt.vreplication record (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>

* [release-22.0] Fix for simple projection showing no fields (vitessio#18489) (vitessio#18493)

Signed-off-by: Dirkjan Bussink <d.bussink@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>

* [release-22.0] Fix scalar aggregation with literals in empty result sets (vitessio#18477) (vitessio#18491)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Fix watcher storm during topo outages (vitessio#18434) (vitessio#18440)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>

* [release-22.0] Avoid terminating atomic copy workflows on error if they are out of copy phase (vitessio#18475) (vitessio#18487)

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

* [release-22.0] Bump @babel/runtime from 7.26.0 to 7.27.6 in /web/vtadmin (vitessio#18467) (vitessio#18502)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [release-22.0] Bump vite from 4.5.9 to 4.5.14 in /web/vtadmin (vitessio#18485) (vitessio#18500)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [release-22.0] Fix regression in v22 around new flag setup (vitessio#18507) (vitessio#18509)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Bump form-data from 4.0.1 to 4.0.4 in /web/vtadmin (vitessio#18473) (vitessio#18504)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [release-22.0] bugfix: Plan group by only on top of derived tables correctly (vitessio#18505) (vitessio#18511)

Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>

* [release-22.0] Fix GetSchema RPC to prevent returning view definitions when EnableViews is disabled (vitessio#18513) (vitessio#18517)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] CI: Fix `VDiff2` flaky e2e test (vitessio#18494) (vitessio#18526)

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

* [release-22.0]  Fix foreign key relation with routed tables (vitessio#18537) (vitessio#18541)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Try updating the create PR workflow step (vitessio#18563) (vitessio#18571)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Fix a panic in VDiff when reconciling extra rows. (vitessio#18585) (vitessio#18596)

Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] fix: remove database qualifier after building query in operator to sql (vitessio#18602) (vitessio#18605)

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Introduce aliases for foreign keys verify operations (vitessio#18601) (vitessio#18614)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>

* [release-22.0] [CI] Use the draft state from the event payload instead of calling `curl`. (vitessio#18650) (vitessio#18652)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] fix: Fix `GenerateShardRanges` returning shard names that don't cover the full range (vitessio#18641) (vitessio#18654)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Arthur Schreiber <arthur@planetscale.com>

* [release-22.0] Fix: Improve VDiff internal query performance (vitessio#18579) (vitessio#18632)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Arthur Schreiber <arthur@planetscale.com>

* [release-22.0] Simplify workflow files. (vitessio#18649) (vitessio#18656)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>

* [release-22.0] ci: Replace `always()` with `!cancelled()`. (vitessio#18659) (vitessio#18662)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] ci: Disable man-db auto updates. (vitessio#18665) (vitessio#18668)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] ci: Bump `actions/setup-go` to `v5.5.0`. (vitessio#18660) (vitessio#18670)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Update codeowners and maintainers. (vitessio#18676)

* [release-22.0] Upgrade the Golang version to `go1.24.7` (vitessio#18621)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Nick Van Wiggeren <nick@planetscale.com>
Co-authored-by: frouioui <35779988+frouioui@users.noreply.github.com>
Co-authored-by: Nick Van Wiggeren <nick@planetscale.com>

* [release-22.0] ci: don't run codecov twice. (vitessio#18680) (vitessio#18682)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Update CODEOWNERS (vitessio#18697) (vitessio#18699)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] fix: ensure callbacks are not called after `VStream` returns (vitessio#18689) (vitessio#18705)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>

* [release-22.0] CONNPOOL: Fix race condition when waiting for connection (vitessio#18713) (vitessio#18721)

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: Arthur Schreiber <arthur@planetscale.com>

* [release-22.0] connpool: Bump the hang detection timeout to fix flakiness (vitessio#18722) (vitessio#18724)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Fix handling of tuple bind variables in filtering operations. (vitessio#18736) (vitessio#18746)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Potential fix for code scanning alert no. 2992: Clear-text logging of sensitive information (vitessio#18754) (vitessio#18759)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>

* [release-22.0] update java packages to use central instead of ossrh (vitessio#18765) (vitessio#18766)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] VReplication: Ensure proper handling of keyspace/database names with dashes (vitessio#18762) (vitessio#18772)

Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>

* [release-22.0] Resolve `commons-lang` vulnerability in Java driver (vitessio#18768) (vitessio#18796)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] ci: use the newest mysql apt config package (vitessio#18790) (vitessio#18793)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>
Co-authored-by: Arthur Schreiber <arthur@planetscale.com>

* [release-22.0] `vtctldclient GetPermissions`: hide `authentication_string` from response (vitessio#18771) (vitessio#18798)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* [release-22.0] repltracker: reset replica lag when we are primary (vitessio#18800) (vitessio#18806)

Signed-off-by: Nick Van Wiggeren <nick@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Address dir traversal in file backup storage `GetBackups` RPC (vitessio#18814) (vitessio#18817)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] VReplication: Treat ER_BINLOG_CREATE_ROUTINE_NEED_SUPER as unrecoverable (vitessio#18784) (vitessio#18819)

Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Upgrade the Golang version to `go1.24.9` (vitessio#18737)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Nick Van Wiggeren <nick@planetscale.com>
Co-authored-by: frouioui <35779988+frouioui@users.noreply.github.com>
Co-authored-by: Nick Van Wiggeren <nick@planetscale.com>

* [release-22.0] vtadmin: upgrade vite to the latest (vitessio#18803) (vitessio#18811)

Signed-off-by: Nick Van Wiggeren <nick@planetscale.com>
Co-authored-by: Nick Van Wiggeren <nickvanw@users.noreply.github.com>

* [release-22.0] Fix bug where query consolidator returns empty result without error when the waiter cap exceeded (vitessio#18782) (vitessio#18832)

Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Stas Maksimov <maksimov@gmail.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* [release-22.0] ci: extract os tuning (vitessio#18824) (vitessio#18826)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>

* [release-22.0] ci: DRY up MySQL Setup (vitessio#18815) (vitessio#18836)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>

* [release-22.0] Fix flaky tests (vitessio#18835) (vitessio#18838)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>

* [release-22.0] copy_state: use a mediumblob instead of a smaller varbinary for lastpk (vitessio#18852) (vitessio#18858)

Signed-off-by: Nick Van Wiggeren <nick@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] BuiltinBackupEngine: Retry file close and fail backup when we cannot (vitessio#18848) (vitessio#18861)

Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] fix sqlSelectLimit propagating to subqueries (vitessio#18716) (vitessio#18872)

Signed-off-by: ghostframe <marcosandresdiaz@gmail.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>

* [release-22.0] Code Freeze for `v22.0.2` (vitessio#18876)

Signed-off-by: Matt Lord <mattalord@gmail.com>

* [release-22.0] Release of `v22.0.2` (vitessio#18878)

Signed-off-by: Matt Lord <mattalord@gmail.com>

* connpool: Replace semaphore with channel-based synchronization

After merging upstream v22.0.2, the semaphore type was undefined because
sema_norace.go was not included in the merge. This fixes the compilation
error by replacing semaphore-based synchronization with channels, eliminating
the dependency on Go runtime internals.

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

* deps: Migrate from cgroups v1 to v3 for Go 1.24 compatibility

The containerd/cgroups v1.1.0 package has type incompatibilities with
Go 1.24, causing build failures with errors like "invalid operation:
resources.Pids.Limit > 0 (mismatched types *int64 and untyped int)".

Updated metrics_cgroup.go to use cgroups v3 API, which is compatible
with Go 1.24 and provides the same functionality.

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

* ci: Remove slack branch restriction from workflow skip logic

Removed the check that restricted CI workflows to only run on
slack-[0-9]+\.[0-9] branch pattern. Now workflows will run on all
branch pushes (except those handled by PR/main/tag logic).

This allows feature branches like merge-v22.0.2 to trigger CI tests
without needing to match the slack-* naming pattern.

Modified templates:
- test/templates/unit_test.tpl
- test/templates/cluster_vitess_tester.tpl
- test/templates/cluster_endtoend_test.tpl
- test/templates/cluster_endtoend_test_mysql57.tpl
- test/templates/cluster_endtoend_test_docker.tpl

Regenerated 66 workflow files from templates.

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

* ci: Remove workflow skip check entirely

Completely removed the "Check if workflow needs to be skipped" step from
all workflow templates. Workflows will now run on all pushes and pull
requests, only gated by the "Skip CI" label check and the paths-filter
for relevant file changes.

This simplifies the workflow logic by removing branch-based skip
conditions, allowing all branches to trigger CI tests.

Modified templates:
- test/templates/unit_test.tpl
- test/templates/cluster_vitess_tester.tpl
- test/templates/cluster_endtoend_test.tpl
- test/templates/cluster_endtoend_test_mysql57.tpl
- test/templates/cluster_endtoend_test_docker.tpl

Regenerated 21 workflow files from templates.

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

* ci: Remove slack branch pattern from hand-written workflows

Removed the slack-[0-9]+\.[0-9]$ branch pattern check from all
hand-written (non-generated) workflow files. This completes the
removal of slack branch restrictions across all CI workflows.

Modified 30 hand-written workflow files including:
- e2e_race.yml
- endtoend.yml
- unit_race*.yml
- upgrade_downgrade_test_*.yml
- vtadmin_web_*.yml
- *_example.yml workflows
- and others

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

* ci: Remove skip-workflow step from all remaining workflows

Completely removed the "Check if workflow needs to be skipped" step
from all 75 remaining workflow files. All workflows now execute on
every push and pull request, with only two gates:

1. "Skip CI" label check (for PRs)
2. paths-filter checks (only run when relevant files change)

This removes all branch-based skip logic, allowing CI to run on all
branches including feature branches like merge-v22.0.2.

Modified workflows include:
- All generated workflows (cluster_endtoend_*, unit_test_*, etc.)
- Hand-written workflows (e2e_race, endtoend, unit_race, etc.)
- Upgrade/downgrade test workflows
- VTAdmin workflows
- Example workflows

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

* ci: Use GitHub native triggers to prevent duplicate runs

Applied the upstream simplification from commit 6d30034 that uses
GitHub's native trigger filtering instead of skip-workflow logic:

- Pushes only trigger on main and release-* branches
- All pull requests trigger workflows
- All tags trigger workflows

This prevents duplicate workflow runs when pushing to PR branches
while ensuring CI runs on all pull requests.

Modified:
- 5 workflow templates
- 76 workflow files (66 generated + hand-written files)

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

* ci: Add branch filters to upgrade_downgrade_test workflows

Previously these workflows triggered on all push and pull_request
events without branch filtering, causing duplicate runs.

Added branch filters to match the pattern used in other workflows:
- push: only on main, release-* branches, and all tags
- pull_request: on all branches

This prevents duplicate workflow runs while ensuring tests still
run on relevant branches.

Fixes duplicate runs reported for upgrade_downgrade_test_backups_e2e_next_release.yml
and 15 other upgrade_downgrade_test_*.yml workflows.

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

* docker: Add private repository support for vitess-addons

Add configuration to support accessing private GitHub repositories
during Docker builds, specifically for github.com/slackhq/vitess-addons.

Changes:
- Set GOPRIVATE environment variable after PATH configuration
- Add GH_ACCESS_TOKEN build argument and environment variable
- Configure git to use access token for GitHub authentication

This enables building Docker images that depend on private Slack
repositories by passing --build-arg GH_ACCESS_TOKEN=<token> to
docker build commands.

Modified files:
- docker/bootstrap/Dockerfile.common
- docker/lite/Dockerfile
- docker/lite/Dockerfile.mysql84
- docker/lite/Dockerfile.percona80
- docker/vttestserver/Dockerfile.mysql80
- docker/vttestserver/Dockerfile.mysql84

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

* build: Restore private repository configuration

Re-add GOPRIVATE and GH_ACCESS_TOKEN configuration that was lost
during the v22.0.2 merge. This configuration allows Go to access
the private github.com/slackhq/vitess-addons repository.

The merge resolution chose upstream's Go version (1.24.9) but
inadvertently dropped Slack's private repo setup that existed
before the merge.

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

* proto: Regenerate proto files after v22.0.2 merge

Regenerate all proto files to match the current tooling versions
after the v22.0.2 merge. The main changes are:
- protoc-gen-go version: v1.36.6 to v1.36.5
- Output format: string concatenation to byte array format

These changes are cosmetic and do not affect functionality.

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

* ci: Add branch filters to static_checks_etc workflow

Add proper branch filtering to prevent duplicate workflow runs.

Changed from unfiltered list-style triggers:
  - pull_request
  - push

To filtered object-style triggers:
  push:
    branches: [main, release-*]
    tags: all
  pull_request:
    branches: all

This matches the pattern used in other workflows and prevents
the workflow from running twice (once for push, once for PR).

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

* [release-22.0] Don't hardcode the go version to use for upgrade/downgrade tests. (vitessio#18920) (vitessio#18955)

Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>

* [release-22.0] Upgrade the Golang version to `go1.24.10` (vitessio#18897)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: frouioui <35779988+frouioui@users.noreply.github.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>
Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>

* [release-22.0] `ci`: use `etcd` v3.5.25, add retries (vitessio#19015) (vitessio#19021)

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>

* temporary change previous version to v21

Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>

* ci: Skip upgrade_downgrade_*_next_release tests for slack-* branch PRs

Add branches-ignore filter to skip upgrade_downgrade_*_next_release
workflow tests when PRs target slack-[0-9]+.[0-9] branches. These
tests compare against the next upstream release which doesn't apply
to Slack-specific release branches.

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

* ci: Add vitess-addons env and GitHub access token to upgrade_downgrade tests

Add GOPRIVATE and GH_ACCESS_TOKEN environment variables and Setup
GitHub access token step to all upgrade_downgrade test workflows that
were missing them. This ensures consistent access to private Slack
repositories across all test workflows.

Files updated:
- upgrade_downgrade_test_backups_e2e.yml
- upgrade_downgrade_test_backups_manual.yml
- upgrade_downgrade_test_backups_manual_next_release.yml
- upgrade_downgrade_test_onlineddl_flow.yml
- upgrade_downgrade_test_query_serving_queries.yml
- upgrade_downgrade_test_query_serving_queries_2.yml
- upgrade_downgrade_test_query_serving_schema.yml
- upgrade_downgrade_test_reparent_old_vtctl.yml
- upgrade_downgrade_test_reparent_old_vttablet.yml
- upgrade_downgrade_test_semi_sync.yml

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

* temporarily set previous release to 21.0

Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>

* ci: Skip reparent_new tests for slack-* branch PRs

Add branches-ignore filter to skip upgrade_downgrade_test_reparent_new_*
workflow tests when PRs target slack-[0-9]+.[0-9] branches. These tests
compare against the next upstream release which doesn't apply to
Slack-specific release branches.

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

* fix conflict merge mistake

Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>

* ci: Skip vtop_example test for slack-* branch PRs

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

---------

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>
Signed-off-by: Mohamed Hamza <mhamza15@github.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Manan Gupta <manan@planetscale.com>
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Signed-off-by: siddharth16396 <siddharth16396@gmail.com>
Signed-off-by: Matt Lord <mattalord@gmail.com>
Signed-off-by: Noble Mittal <noblemittal@outlook.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Arthur Schreiber <arthur@planetscale.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Nick Van Wiggeren <nick@planetscale.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tanjin Xu <tanjin.xu@slack-corp.com>
Signed-off-by: ghostframe <marcosandresdiaz@gmail.com>
Co-authored-by: vitess-bot <139342327+vitess-bot@users.noreply.github.com>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Harshit Gangal <harshit@planetscale.com>
Co-authored-by: Mohamed Hamza <mhamza15@github.com>
Co-authored-by: Andrés Taylor <andres@planetscale.com>
Co-authored-by: frouioui <frouioui@users.noreply.github.com>
Co-authored-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: Manan Gupta <guptamanan100@gmail.com>
Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com>
Co-authored-by: Noble Mittal <noblemittal@outlook.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Arthur Schreiber <arthurschreiber@github.com>
Co-authored-by: Arthur Schreiber <arthur@planetscale.com>
Co-authored-by: frouioui <35779988+frouioui@users.noreply.github.com>
Co-authored-by: Nick Van Wiggeren <nick@planetscale.com>
Co-authored-by: Matt Lord <mattalord@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Nick Van Wiggeren <nickvanw@users.noreply.github.com>
Co-authored-by: Stas Maksimov <maksimov@gmail.com>
Co-authored-by: Claude <svc-devxp-claude@slack-corp.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.

6 participants