bulk: fix incorrect memory handling in the kvBuf #86738
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 |
stevendanna
reviewed
Aug 24, 2022
Comment on lines
+200
to
+202
| if b.curBuf.fits(ctx, need, sz(b.maxBufferLimit()), &b.memAcc) { | ||
| return b.curBuf.append(key, value) | ||
| } |
adityamaru
force-pushed
the
import-investigation
branch
3 times, most recently
from
860c286 to
be9ce7e
Compare
This change fixes a memory accounting bug where we were appending a KV to the kvBuf without accounting for its memory. Release note (bug fix): adds a missing memory accounting call when appending a KV to the underlying kvBuf Release justification: low risk bug fix that prevents an import from panicking on non-release builds
adityamaru
force-pushed
the
import-investigation
branch
from
be9ce7e to
f3f5cc5
Compare
adityamaru
commented
Aug 28, 2022
| @@ -41,8 +41,8 @@ func TestAddBatched(t *testing.T) { | |||
| t.Run("batch=default", func(t *testing.T) { | |||
| runTestImport(t, 32<<20) | |||
| }) | |||
| t.Run("batch=1", func(t *testing.T) { | |||
There was a problem hiding this comment.
This test is no longer valid since a 1byte max buf size means we can't grow the kvBuf to be more than that, which means the single KV doesn't fit in that buffer.
stevendanna
approved these changes
Aug 28, 2022
|
TFTR! bors r=stevendanna |
|
Build succeeded: |
|
blathers backport 22.1 |
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.
This change fixes a memory accounting bug where
we were appending a KV to the kvBuf without accounting
for its memory.
Release note (bug fix): adds a missing memory accounting
call when appending a KV to the underlying kvBuf
Release justification: low risk bug fix that prevents an
import from panicking on non-release builds