Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-23.2: changefeedccl: add scoping support for max_behind_nanos #139241

Merged
merged 1 commit into from
Jan 17, 2025
Merged

release-23.2: changefeedccl: add scoping support for max_behind_nanos #139241

merged 1 commit into from
Jan 17, 2025
+55 −48

Conversation

aerfrei
Copy link
Contributor

@aerfrei aerfrei commented Jan 16, 2025 •
edited
Loading

Backport 1/1 commits from #137534.

/cc @cockroachdb/release

release justification: needed for client

Currently, changefeed.max_behind_nanos is a measurement of the
lag of the furthest behind changefeed. We'd like to be able to
support scoping/grouping changefeeds. This applies scoping to
that metric similar to the scoping on changefeed.aggregator_progress.

Epic: none
Fixes: #132281

Release note (ops change): the changefeed.max_behind_nanos metric
now supports scoping with metric labels.

@aerfrei aerfrei requested review from a team as code owners January 16, 2025 19:03
@aerfrei aerfrei removed the request for review from a team January 16, 2025 19:03
@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Jan 16, 2025

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues     or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@aerfrei aerfrei requested a review from dhartunian January 16, 2025 19:03
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jan 16, 2025
@aerfrei aerfrei requested review from wenyihu6 and removed request for a team January 16, 2025 19:03
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@aerfrei aerfrei requested a review from asg0451 January 16, 2025 20:07
@dhartunian
Copy link
Collaborator

drive-by comment: a little suspicious that we're "undeprecating" a metric in a backport. does it merit mentioning in the release note? not sure how heavily these are being used by customers.

@asg0451
Copy link
Contributor

asg0451 commented Jan 16, 2025

drive-by comment: a little suspicious that we're "undeprecating" a metric in a backport. does it merit mentioning in the release note? not sure how heavily these are being used by customers.

FWIW in practice this metric is heavily used by customers, despite the deprecation warning

asg0451
asg0451 requested changes Jan 17, 2025
View reviewed changes
Copy link
Contributor

@asg0451 asg0451 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think there were some issues with the conflict resolution here

pkg/ccl/changefeedccl/metrics.go Outdated
@@ -959,7 +968,7 @@ func newAggregateMetrics(histogramWindow time.Duration, lookup *cidr.Lookup) *Ag
TotalRanges: b.Gauge(metaTotalRanges),
CloudstorageBufferedBytes: b.Gauge(metaCloudstorageBufferedBytes),
SinkErrors: b.Counter(metaSinkErrors),
Timers: timers.New(histogramWindow),
MaxBehindNanos: b.FunctionalGauge(metaChangefeedMaxBehindNanos, functionalGaugeMaxFn),Timers: timers.New(histogramWindow),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad merge / needs fmt?

pkg/ccl/changefeedccl/metrics.go Show resolved Hide resolved
aerfrei
aerfrei commented Jan 17, 2025
View reviewed changes
Copy link
Contributor Author

@aerfrei aerfrei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing that

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @asg0451, @dhartunian, and @wenyihu6)

pkg/ccl/changefeedccl/metrics.go Show resolved Hide resolved
@aerfrei
changefeedccl: add scoping support for max_behind_nanos
80ce6d5 
Currently, changefeed.max_behind_nanos is a measurement of the
lag of the furthest behind changefeed. We'd like to be able to
support scoping/grouping changefeeds. This applies scoping to
that metric similar to the scoping on changefeed.aggregator_progress.

Fixes: cockroachdb#132281

Release note (ops change): the changefeed.max_behind_nanos metric
now supports scoping with metric labels.
@aerfrei aerfrei force-pushed the backport23.2-137534 branch from c188534 to 80ce6d5 Compare January 17, 2025 16:55
@aerfrei aerfrei merged commit be4c08e into cockroachdb:release-23.2 Jan 17, 2025
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asg0451 asg0451 asg0451 approved these changes

@dhartunian dhartunian Awaiting requested review from dhartunian dhartunian is a code owner automatically assigned from cockroachdb/obs-prs

@wenyihu6 wenyihu6 Awaiting requested review from wenyihu6 wenyihu6 is a code owner automatically assigned from cockroachdb/cdc-prs

Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aerfrei @cockroach-teamcity @dhartunian @asg0451