Merged
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
35f26fa to
3aeaa50
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
857d3e0 to
f79199b
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
agourlay
reviewed
Dec 8, 2025
agourlay
approved these changes
Dec 8, 2025
timvisee
added a commit
that referenced
this pull request
Dec 18, 2025
* Add lease structure to invalidate pending flushers after wipe/clear * We don't use bitmask as barrier anymore * Add missing early return * Add test * Replace flush lease with is alive boolean we also use elsewhere * Reimplement test, now it does fail on the old implementation * In test, cover both new fixed and old broken flushing * Remove old test case because it is flaky * Fix clippy * Fix outdated comment
Merged
1 task
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In #7624 and #7627 we improved flushing for Gridstore.
But, there was still a data race left when wiping/clearing Gridstore. After wiping, it was still possible for a pending (now invalid) flush task to write data to disk. We did add a barrier in
wipe, but that didn't prevent a flusher task to run one more time.This sequence of events was possible:
wipeis called, falls through bitmask barrier, and deletes files on diskI use the same approach as in other places - an 'is alive' flag (for example).
The added test breaks on the old flush behavior. You can try this by commenting out this line:
qdrant/lib/gridstore/src/gridstore.rs
Lines 474 to 477 in 3aeaa50
All Submissions:
devbranch. Did you create your branch fromdev?Changes to Core Features: