fix deadlock between Flush and UnregisterDB #349
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
Signed-off-by: SpadeA-Tang <[email protected]>
bufferflies
approved these changes
Oct 7, 2023
tabokie
reviewed
Oct 8, 2023
memtable/write_buffer_manager.cc
Outdated
| @@ -174,6 +178,7 @@ void WriteBufferManager::FreeMemWithCache(size_t mem) { | |||
| #endif // ROCKSDB_LITE | |||
| } | |||
|
|
|||
| // Must be called without holding db mutex. | |||
There was a problem hiding this comment.
This is not entirely correct. The lock of this_db (if not null) must be held.
memtable/write_buffer_manager.cc
Outdated
| @@ -99,6 +102,7 @@ void WriteBufferManager::UnregisterColumnFamily(ColumnFamilyHandle* cf) { | |||
| MaybeFlushLocked(); | |||
| } | |||
|
|
|||
| // Must be called without holding db mutex. | |||
memtable/write_buffer_manager.cc
Outdated
| @@ -73,6 +73,7 @@ void WriteBufferManager::SetFlushSize(size_t new_size) { | |||
| } | |||
| } | |||
|
|
|||
| // Must be called without holding db mutex. | |||
There was a problem hiding this comment.
Comment should be placed in header file.
Signed-off-by: SpadeA-Tang <[email protected]>
Signed-off-by: SpadeA-Tang <[email protected]>
Signed-off-by: SpadeA-Tang <[email protected]>
|
I discovered some comments are already in header file, I removed the redundancies. PTAL again @tabokie thanks. |
Signed-off-by: SpadeA-Tang <[email protected]>
tabokie
approved these changes
Oct 9, 2023
This was referenced Oct 9, 2023
v01dstar
pushed a commit
to v01dstar/rocksdb
that referenced
this pull request
May 29, 2024
Signed-off-by: SpadeA-Tang <[email protected]>
v01dstar
pushed a commit
to v01dstar/rocksdb
that referenced
this pull request
Oct 2, 2024
Signed-off-by: SpadeA-Tang <[email protected]> Signed-off-by: Yang Zhang <[email protected]>
v01dstar
pushed a commit
to v01dstar/rocksdb
that referenced
this pull request
Oct 2, 2024
Signed-off-by: SpadeA-Tang <[email protected]> Signed-off-by: Yang Zhang <[email protected]>
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.
The caller of
MaybeFlushLockedshould be called without holding db mutex.