store: fix marshaling with sync.Pool #4593
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
GiedriusS
force-pushed
the
fix/marshaling
branch
from
294de2d
to
34f505c
Compare
Do not forget to check the length of a slice returned by sync.Pool. Annotate the whole function with comments to aid understanding of it. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
GiedriusS
force-pushed
the
fix/marshaling
branch
from
34f505c
to
6278bd5
Compare
yeya24
previously approved these changes
Aug 24, 2021
yeya24
reviewed
Aug 24, 2021
pkg/store/storepb/custom.go
Outdated
| m.respBuf = poolBuf.(*[]byte) | ||
| respBuf = *m.respBuf | ||
| } | ||
| m.respBuf = nil |
bwplotka
previously approved these changes
Aug 24, 2021
pkg/store/storepb/custom.go
Outdated
| m.respBuf = poolBuf.(*[]byte) | ||
| respBuf = *m.respBuf | ||
| } | ||
| m.respBuf = nil |
| } | ||
|
|
||
| // Fast path with sync.Pool. | ||
| // m.respBuf must not be nil so that it would be returned to the pool. |
There was a problem hiding this comment.
Does it need to non nil if we do the work below? Can we always do that and remove any outside call pool Get?
There was a problem hiding this comment.
I'm not sure I understood this comment. The callers using the old function pass nil thus we need to handle this case - it is not guaranteed that the pool exists
There was a problem hiding this comment.
I know, i thought we can simplify, and allow this method to Get, never pass it from outside - not a biggie
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
GiedriusS
force-pushed
the
fix/marshaling
branch
from
4a4b254
to
7f8331f
Compare
bwplotka
reviewed
Aug 24, 2021
There was a problem hiding this comment.
Looks like we still have this data race we discussed here here https://cloud-native.slack.com/archives/CL25937SP/p1629797444067700
bwplotka
approved these changes
Aug 24, 2021
GiedriusS
added a commit
to GiedriusS/thanos
that referenced
this pull request
Aug 27, 2021
This reverts commit 8b4c3c9. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
bwplotka
pushed a commit
that referenced
this pull request
Aug 27, 2021
* Revert "store: fix marshaling with sync.Pool (#4593)" This reverts commit 8b4c3c9. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Revert "[v2] store: reuse buffers for serializing Series() responses (#4535)" This reverts commit 7a8d189. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
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.
Do not forget to check the length of a slice returned by sync.Pool.
Annotate the whole function with comments to aid understanding of it.
Cover the case with a test that fails on
main.Fixes #4591.
cc @yeya24 as you've noticed this too
Signed-off-by: Giedrius Statkevičius giedrius.statkevicius@vinted.com