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

fix(tsm1): fix data race and validation in cache ring #20843

Merged
merged 4 commits into from
Mar 9, 2021

Conversation

danxmoran
Copy link
Contributor

@danxmoran danxmoran commented Mar 2, 2021

Closes #20801

Backports #20797, #20803, and #20890

@danxmoran danxmoran requested a review from psteinbachs March 2, 2021 17:53
@StoneYunZhao
Copy link
Contributor

I'm curious if need to delete (*Cache) Write([]byte, []Value) method in cache.go too.

@danxmoran
Copy link
Contributor Author

danxmoran commented Mar 8, 2021

I'm curious if need to delete (*Cache) Write([]byte, []Value) method in cache.go too.

I'll investigate, and open a follow-up PR if so. In general I'd prefer to keep these backports as close to the original merges as possible, otherwise we need to track forward-ports in addition to backports and it all becomes a mess.

EDIT: That method was indeed dead code, I've opened a PR to delete it. Once that merges I'll add the cherry-picked commit here.

@danxmoran danxmoran force-pushed the dm-backport-ring-fixes-20801 branch 2 times, most recently from b071afe to 27f9105 Compare March 9, 2021 14:14
Copy link
Contributor

@psteinbachs psteinbachs left a comment

Choose a reason for hiding this comment

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

Good to go.

@danxmoran danxmoran force-pushed the dm-backport-ring-fixes-20801 branch from 27f9105 to 525aa8e Compare March 9, 2021 22:32
@danxmoran danxmoran merged commit 9266b6c into 2.0 Mar 9, 2021
@danxmoran danxmoran deleted the dm-backport-ring-fixes-20801 branch March 9, 2021 22:46
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.

4 participants