Skip to content

Comments

[slack-22.0] V22 cdc backports round two#784

Merged
tanjinx merged 10 commits intoslack-22.0from
v22-cdc-backports-round-two
Jan 30, 2026
Merged

[slack-22.0] V22 cdc backports round two#784
tanjinx merged 10 commits intoslack-22.0from
v22-cdc-backports-round-two

Conversation

@twthorn
Copy link

@twthorn twthorn commented Jan 28, 2026

Description

Backport these PRs for vstream/cdc

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

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

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
…nd chunks to client (vitessio#18849)

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
…se cases (vitessio#18938)

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>
Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
@twthorn twthorn requested a review from a team as a code owner January 28, 2026 23:32
@github-actions github-actions bot added this to the v22.0.2 milestone Jan 28, 2026
Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
seagraveslack
seagraveslack previously approved these changes Jan 29, 2026
Apply missing changes from PR vitessio#18791 to metrics_cgroup.go:
- Replace cgroup1Manager and cgroup2Manager with single cgroupManager
- Add errCgroupMetricsNotAvailable error variable
- Add sync.Once for lazy initialization
- Remove cgroup v1 support, only support cgroup v2
- Simplify implementation with unified cgroup manager

This fixes compilation errors in metrics_cgroup_test.go.
Required by metrics_cgroup.go for cgroup v1/v2 support.

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
The v1 cgroups package is incompatible with Go 1.24.10.
Use cgroups/v3 consistently throughout the file.

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
@codecov-commenter
Copy link

Codecov Report

❌ Patch coverage is 69.16667% with 37 lines in your changes missing coverage. Please review.
✅ Project coverage is 69.74%. Comparing base (b1ab347) to head (105fdf1).
⚠️ Report is 25 commits behind head on slack-22.0.

Files with missing lines Patch % Lines
go/vt/vtgate/vstream_manager.go 71.42% 24 Missing ⚠️
go/vt/servenv/metrics_cgroup.go 64.51% 11 Missing ⚠️
go/vt/servenv/metrics.go 50.00% 2 Missing ⚠️
Additional details and impacted files
@@              Coverage Diff               @@
##           slack-22.0     #784      +/-   ##
==============================================
+ Coverage       67.53%   69.74%   +2.21%     
==============================================
  Files            1600     1605       +5     
  Lines          261782   213608   -48174     
==============================================
- Hits           176786   148989   -27797     
+ Misses          84996    64619   -20377     

☔ 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 tanjinx merged commit 73edc90 into slack-22.0 Jan 30, 2026
86 of 92 checks passed
@tanjinx tanjinx deleted the v22-cdc-backports-round-two branch January 30, 2026 18:05
@tanjinx tanjinx changed the title V22 cdc backports round two [slack-22.0] V22 cdc backports round two Jan 30, 2026
sbaker617 pushed a commit that referenced this pull request Feb 5, 2026
* Improve cgroup metric management (vitessio#18791)

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

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* VStream: Prevent buffering entire transactions (OOM risk), instead send chunks to client (vitessio#18849)

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* Run VStream copy only when VGTID requires it, use TablesToCopy in those cases (vitessio#18938)

Signed-off-by: twthorn <thomaswilliamthornton@gmail.com>
Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* Regenerate vtgate.pb.go proto file

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* Fix tests

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* Complete PR vitessio#18791 backport: Update metrics_cgroup.go

Apply missing changes from PR vitessio#18791 to metrics_cgroup.go:
- Replace cgroup1Manager and cgroup2Manager with single cgroupManager
- Add errCgroupMetricsNotAvailable error variable
- Add sync.Once for lazy initialization
- Remove cgroup v1 support, only support cgroup v2
- Simplify implementation with unified cgroup manager

This fixes compilation errors in metrics_cgroup_test.go.

* Add missing github.com/containerd/cgroups dependency

Required by metrics_cgroup.go for cgroup v1/v2 support.

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* Fix cgroups import to use v3

The v1 cgroups package is incompatible with Go 1.24.10.
Use cgroups/v3 consistently throughout the file.

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

* Fix goimports formatting

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>

---------

Signed-off-by: Thomas Thornton <thomaswilliamthornton@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants