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.

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

release-23.1: kvcoord: Fix metrics tracking in mux rangefeed #108038

Merged
merged 1 commit into from
Aug 3, 2023

Conversation

miretskiy
Copy link
Contributor

@miretskiy miretskiy commented Aug 2, 2023

Backport 1/1 commits from #107384.

/cc @cockroachdb/release


Fix an observability bug in mux rangefeed which would incorrectly count various rangefeed related metrics (total ranges, catchup ranges, etc).

Fixes #106152
Fixes #106252

Release note: None
Release justification: fix observability/metrics accounting in mux rangefeed (disabled by default)

@miretskiy miretskiy requested review from erikgrinaker and a team August 2, 2023 17:38
@miretskiy miretskiy requested a review from a team as a code owner August 2, 2023 17:38
@blathers-crl
Copy link

blathers-crl bot commented Aug 2, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • 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.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@miretskiy
Copy link
Contributor Author

@erikgrinaker some conflicts occurred; but overall mostly clean backport.

@miretskiy miretskiy force-pushed the backport23.1-107384 branch from a5257cc to df8c73f Compare August 2, 2023 19:57
Fix an observability bug in mux rangefeed which would
incorrectly count various rangefeed related metrics
(total ranges, catchup ranges, etc).

Fixes cockroachdb#106152
Fixes cockroachdb#106252

Release note: None
@miretskiy miretskiy force-pushed the backport23.1-107384 branch from df8c73f to 60dc414 Compare August 3, 2023 01:06
@erikgrinaker
Copy link
Contributor

I have a cluster running master which doesn't appear to be populating distsender.rangefeed.catchup_ranges. Going to confirm before approving this.

@miretskiy
Copy link
Contributor Author

I have a cluster running master which doesn't appear to be populating distsender.rangefeed.catchup_ranges. Going to confirm before approving this.

I fixed an issue by adding metric struct tag to the new struct. Found it because chart.catalig test failed. I'm surprised it is still not fixed.

@erikgrinaker
Copy link
Contributor

Yeah, that fix isn't merged yet. Can confirm that metrics are broken on master, so let's hold off on this.

@miretskiy
Copy link
Contributor Author

Yeah, that fix isn't merged yet. Can confirm that metrics are broken on master, so let's hold off on this.

Can you pick my other metrics or to see if that's what was needed?

@erikgrinaker
Copy link
Contributor

Works with #108062.

@miretskiy
Copy link
Contributor Author

@erikgrinaker okay to merge this one then?

@erikgrinaker
Copy link
Contributor

We should pull in the fix.

@miretskiy
Copy link
Contributor Author

It's here already. That's how I discovered this issue (because of catalog_chart tests -- and those tests were removed on the master. note to self: we really need to have a linter or some such to protect against that)

Copy link
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

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

Ah, missed that.

@miretskiy miretskiy merged commit 370b036 into cockroachdb:release-23.1 Aug 3, 2023
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.

3 participants