fix: apply locality filter in statsForSpan to prevent ApproximateTotalStats over-count - #173216
Open
waterWang wants to merge 1 commit into
Open
fix: apply locality filter in statsForSpan to prevent ApproximateTotalStats over-count#173216waterWang wants to merge 1 commit into
waterWang wants to merge 1 commit into
Conversation
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? Thank you for contributing to CockroachDB. Please ensure you have followed the guidelines for creating a PR. Before a member of our team reviews your PR, I have some potential action items for you:
🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
SpanStats.ApproximateTotalStatsis intended to approximate the post-replication (physical) MVCC size of a span — roughlylogical_size × replication_factor. Instead, it scales with the number of nodes the span's ranges live on, not the replication factor. For a span that occupies more nodes than RF,ApproximateTotalStatsover-reports bynumNodesContacted / RF.Root cause
In
statsForSpan, every fanned-out node iterates all range descriptors overlapping the span and collects MVCC stats for every range — regardless of whether the node holds a replica of that range. The coordinator'scollectSpanStatsResponsesthen sums each node's full logicalTotalStatsintoApproximateTotalStats:Since each node returns the full logical size for all ranges, the sum equals
numNodes × logicalinstead ofRF × logical. The bug is masked for spans confined to exactly RF nodes (wherenumNodes == RF) and only appears once a span is wide enough to live on more than RF nodes.Fix
Apply a locality filter in
statsForSpan: only collect MVCC stats for ranges where the current node holds a replica. This makes each node's contribution its actual share of the span, so the coordinator's sum across nodes yields the true replicated (RF × logical) total.The metadata (
RangeCount,ReplicaCount,StoreIDs) is still recorded for every range so the coordinator retains complete span-wide information.Fixes #173182