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

Fix for RecoverFromRetryableBGIOError starting with recovery_in_prog_ false #11991

Closed
wants to merge 11 commits into from
Closed

Fix for RecoverFromRetryableBGIOError starting with recovery_in_prog_ false #11991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
759a726
Add recovery_in_prog_ Assertion in RecoverFromRetryableBGIOError
jaykorean Oct 20, 2023
3bcb8e1
UnitTest to repro recovery_in_prog_ being false when Recover starts
jaykorean Oct 23, 2023
ac43c6a
fix test race condition
jaykorean Oct 23, 2023
4865315
Fix and assertion added
jaykorean Oct 23, 2023
eea6910
Test race condition fix
jaykorean Oct 25, 2023
7f9302c
remove some unnecessary changes
jaykorean Oct 25, 2023
ce5ba88
Fix typo and linter
jaykorean Oct 25, 2023
80c127b
Fix the race condition by removing double-clearing bg_error and others
jaykorean Oct 30, 2023
84df441
remvoe unnecessary syncpoint
jaykorean Oct 30, 2023
9f43e8f
clear is_db_stopped_ as well
jaykorean Oct 31, 2023
3ec955e
Address test feedback
jaykorean Oct 31, 2023
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
17 changes: 6 additions & 11 deletions db/error_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ Status ErrorHandler::ClearBGError() {
// old_bg_error is only for notifying listeners, so may not be checked
old_bg_error.PermitUncheckedError();
// Clear and check the recovery IO and BG error
is_db_stopped_.store(false, std::memory_order_release);
bg_error_ = Status::OK();
recovery_error_ = IOStatus::OK();
bg_error_.PermitUncheckedError();
Expand Down Expand Up @@ -671,11 +672,14 @@ const Status& ErrorHandler::StartRecoverFromRetryableBGIOError(
// wait the previous recover thread to finish and create a new thread
// to recover from the bg error.
db_mutex_->Unlock();
TEST_SYNC_POINT(
"StartRecoverFromRetryableBGIOError:BeforeWaitingForOtherThread");
old_recovery_thread->join();
TEST_SYNC_POINT(
"StartRecoverFromRetryableBGIOError:AfterWaitingForOtherThread");
db_mutex_->Lock();
}

TEST_SYNC_POINT("StartRecoverFromRetryableBGIOError::in_progress");
recovery_thread_.reset(
new port::Thread(&ErrorHandler::RecoverFromRetryableBGIOError, this));

Expand All @@ -689,6 +693,7 @@ const Status& ErrorHandler::StartRecoverFromRetryableBGIOError(
// Automatic recover from Retryable BG IO error. Must be called after db
// mutex is released.
void ErrorHandler::RecoverFromRetryableBGIOError() {
assert(recovery_in_prog_);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cbi42 do you think we want to assert other fields here as well?

Copy link
Member

Choose a reason for hiding this comment

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

Not sure, it's hard to figure out all the invariants :)

TEST_SYNC_POINT("RecoverFromRetryableBGIOError:BeforeStart");
TEST_SYNC_POINT("RecoverFromRetryableBGIOError:BeforeStart2");
InstrumentedMutexLock l(db_mutex_);
Expand Down Expand Up @@ -754,22 +759,12 @@ void ErrorHandler::RecoverFromRetryableBGIOError() {
// recover from the retryable IO error and no other BG errors. Clean
// the bg_error and notify user.
TEST_SYNC_POINT("RecoverFromRetryableBGIOError:RecoverSuccess");
Status old_bg_error = bg_error_;
is_db_stopped_.store(false, std::memory_order_release);
Copy link
Member

@cbi42 cbi42 Oct 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

May need to move is_db_stopped_ to ClearBGError() too since it's not set in ClearBGError().

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I guess this wasn't supposed to be missing in ClearBGError() in the first place. Thanks for catching this.

bg_error_ = Status::OK();
bg_error_.PermitUncheckedError();
EventHelpers::NotifyOnErrorRecoveryEnd(
db_options_.listeners, old_bg_error, bg_error_, db_mutex_);
if (bg_error_stats_ != nullptr) {
RecordTick(bg_error_stats_.get(),
ERROR_HANDLER_AUTORESUME_SUCCESS_COUNT);
RecordInHistogram(bg_error_stats_.get(),
ERROR_HANDLER_AUTORESUME_RETRY_COUNT, retry_count);
}
recovery_in_prog_ = false;
if (soft_error_no_bg_work_) {
soft_error_no_bg_work_ = false;
}
return;
} else {
// In this case: 1) recovery_error_ is more serious or not retryable
Expand Down
Loading