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.

Sign up for GitHub

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

CancelAllBackgroundWork: Flush will not wait for stall conditions to clear #832

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

CancelAllBackgroundWork: Flush will not wait for stall conditions to clear #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29e91cb
CancelAllBackgroundWork: Flush does not wait for stall conditions to …
Yuval-Ariel Feb 11, 2024
67b7b61
update history
Yuval-Ariel Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Enhancements

### Bug Fixes
* CancelAllBackgroundWork: Flush does not wait for stall conditions to clear

### Miscellaneous
* WriteController logging: Remove redundant reports when WC is not shared between dbs
Expand Down
4 changes: 3 additions & 1 deletion db/db_impl/db_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,9 @@ void DBImpl::CancelAllBackgroundWork(bool wait) {
if (!shutting_down_.load(std::memory_order_acquire) &&
has_unpersisted_data_.load(std::memory_order_relaxed) &&
!mutable_db_options_.avoid_flush_during_shutdown) {
s = DBImpl::FlushAllColumnFamilies(FlushOptions(), FlushReason::kShutDown);
auto flush_options = FlushOptions();
flush_options.allow_write_stall = true;
s = DBImpl::FlushAllColumnFamilies(flush_options, FlushReason::kShutDown);
s.PermitUncheckedError(); //**TODO: What to do on error?
}

Expand Down
Loading