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

storage: fix mvcc stats on gc of range tombstone over del #87103

Merged
merged 1 commit into from
Aug 31, 2022

Conversation

aliher1911
Copy link
Contributor

@aliher1911 aliher1911 commented Aug 30, 2022

Previously if range tombstone was placed over delete, GC would
not correctly update GC bytes age incorrectly using range tombstone ts
as age of underlying tombstone.

Release justification: Bugfix
Release note: None

Fixing: #87042

@aliher1911 aliher1911 requested a review from a team as a code owner August 30, 2022 12:33
@cockroach-teamcity
Copy link
Member

This change is Reviewable

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.

Please mark this as fixing #87042.

pkg/storage/mvcc.go Outdated Show resolved Hide resolved
pkg/storage/mvcc.go Outdated Show resolved Hide resolved
@aliher1911 aliher1911 self-assigned this Aug 30, 2022
@aliher1911 aliher1911 force-pushed the gc_range_del_over_del branch 3 times, most recently from 6d64de8 to 6b3d98f Compare August 30, 2022 17:59
@tbg tbg removed their request for review August 31, 2022 09:28
pkg/storage/mvcc.go Outdated Show resolved Hide resolved
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.

Thanks!

Comment on lines 4830 to 4832
ms.Add(updateStatsOnGC(gcKey.Key, metaKeySize, metaValSize, meta,
realKeyChanged.WallTime))
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think something got messed up with the formatting here.

Previously if range tombstone was placed over delete, GC would
not correctly update GC bytes age incorrectly using range tombstone ts
as age of underlying tombstone.

Release justification: Bugfix
Release note: None
@aliher1911
Copy link
Contributor Author

bors r=erikgrinaker

@craig
Copy link
Contributor

craig bot commented Aug 31, 2022

Build succeeded:

@craig craig bot merged commit b272795 into cockroachdb:master Aug 31, 2022
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