kvserver: avoid nil deref on replica_stats merge #80071
Merged
Conversation
This file contains 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
|
This change is |
kvoli
force-pushed
the
220416.stats-merge-deref
branch
2 times, most recently
from
f5df859 to
32c6124
Compare
This was referenced Apr 16, 2022
This was referenced Apr 16, 2022
This was referenced Apr 16, 2022
yuzefovich
approved these changes
Apr 16, 2022
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @irfansharif, @kvoli, and @lidorcarmel)
-- commits, line 4 at r1:
nit: s/paritally/partially/.
pkg/kv/kvserver/replica_stats_test.go, line 528 at r1 (raw file):
// Ensure that with uninitialzed entries in replica stats, the result // adjusts correctly. Here we expect the sliding windows to be // merged from most the recent window (tail) backwards.
nit: "most the recent" reads unusual.
A bug existed where when replica stats were merged with only partially initialized windows, merging would result in a nil ptr dereference. This patch updates the logic of replicaStatsMerge to avoid nil dereferences and appropriately handle uninitialized window records. resolves: cockroachdb#80072 Release note: None
kvoli
force-pushed
the
220416.stats-merge-deref
branch
from
32c6124 to
79429fc
Compare
kvoli
commented
Apr 16, 2022
There was a problem hiding this comment.
Reviewable status:
Previously, yuzefovich (Yahor Yuzefovich) wrote…
nit:
s/paritally/partially/.
Updated
pkg/kv/kvserver/replica_stats_test.go, line 528 at r1 (raw file):
Previously, yuzefovich (Yahor Yuzefovich) wrote…
nit: "most the recent" reads unusual.
Reworded.
kvoli
requested review from
irfansharif and
lidorcarmel
and removed request for
lidorcarmel and
irfansharif
|
bors r+ |
|
Build succeeded: |
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.
A bug existed where when replica stats were merged with only partially
initialized windows, merging would result in a nil ptr dereference. This
patch updates the logic of replicaStatsMerge to avoid nil dereferences
and appropriately handle uninitialized window records.
resolves: #80072
Release note: None