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

move dump stats to a separate thread #4382

Closed
wants to merge 9 commits into from
Closed

move dump stats to a separate thread #4382

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3105c30
move dump stats in a separate thread
miasantreble Sep 17, 2018
fe887bc
add cast to avoid overflow
miasantreble Sep 19, 2018
6e90ec4
use RepeatableThread to schedule timed task
miasantreble Sep 28, 2018
08d7efc
fix hang & address review comments
miasantreble Oct 3, 2018
c071d5b
fix deadlock
miasantreble Oct 4, 2018
6f4436f
address Yi's comments
miasantreble Oct 7, 2018
7236bf5
add test coverage
miasantreble Oct 8, 2018
7ad5d45
address review comments
miasantreble Oct 8, 2018
7fa6a49
fix travis crash
miasantreble Oct 9, 2018
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
Prev Previous commit
Next Next commit
fix deadlock
  • Loading branch information
@miasantreble
miasantreble committed Oct 4, 2018
commit c071d5b086f7df6f7fd976172c45a52cff438358
3 changes: 1 addition & 2 deletions db/db_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,6 @@ void DBImpl::WaitForBackgroundWork() {

// Will lock the mutex_, will wait for completion if wait is true
void DBImpl::CancelAllBackgroundWork(bool wait) {
InstrumentedMutexLock l(&mutex_);

if (thread_dump_stats_ != nullptr) {
thread_dump_stats_->cancel();
thread_dump_stats_ = nullptr;
Expand All @@ -369,6 +367,7 @@ void DBImpl::CancelAllBackgroundWork(bool wait) {
ROCKS_LOG_INFO(immutable_db_options_.info_log,
"Shutdown: canceling all background work");

InstrumentedMutexLock l(&mutex_);
if (!shutting_down_.load(std::memory_order_acquire) &&
has_unpersisted_data_.load(std::memory_order_relaxed) &&
!mutable_db_options_.avoid_flush_during_shutdown) {
Expand Down