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

colexecdisk: fix a rare flake in TestExternalSortMemoryAccounting #91871

Merged
merged 1 commit into from
Nov 15, 2022

Conversation

yuzefovich
Copy link
Member

We recently made a change in how we're growing the flat buffer for non-inlined values in the Bytes vector (we now double the capacity). This means that we now might exceed the memory limit sooner (in terms of the batches buffered) than previously since we now have larger allocated capacity. This also triggers a difference in how we're calculating the "proportional size" of the first n elements of the Bytes vector. As a result, a test became flaky since we now might create less partitions than the test expects, so this commit relaxes the assertion.

I did spend some time looking into whether the new behavior is concerning, and I don't think it is.

Fixes: #91850.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

We recently made a change in how we're growing the flat buffer for
non-inlined values in the Bytes vector (we now double the capacity).
This means that we now might exceed the memory limit sooner (in terms of
the batches buffered) than previously since we now have larger allocated
capacity. This also triggers a difference in how we're calculating the
"proportional size" of the first `n` elements of the Bytes vector. As a
result, a test became flaky since we now might create less partitions
than the test expects, so this commit relaxes the assertion.

I did spend some time looking into whether the new behavior is
concerning, and I don't think it is.

Release note: None
Copy link
Collaborator

@DrewKimball DrewKimball left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@yuzefovich
Copy link
Member Author

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 15, 2022

Build succeeded:

@craig craig bot merged commit 4660d3b into cockroachdb:master Nov 15, 2022
@blathers-crl
Copy link

blathers-crl bot commented Nov 15, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 893e44b to blathers/backport-release-22.2-91871: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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.

colexecdisk: flake in TestExternalSortMemoryAccounting
3 participants