Skip to content

Commit ab6edb4

Browse files
fix format
Signed-off-by: Little-Wallace <[email protected]>
1 parent d399620 commit ab6edb4

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

db/db_impl/db_impl_write.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,8 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
634634
if (log_context.need_log_sync) {
635635
InstrumentedMutexLock l(&log_write_mutex_);
636636
if (w.status.ok()) {
637-
w.status = MarkLogsSynced(logfile_number_, log_context.need_log_dir_sync);
637+
w.status =
638+
MarkLogsSynced(logfile_number_, log_context.need_log_dir_sync);
638639
} else {
639640
MarkLogsNotSynced(logfile_number_);
640641
}

db/error_handler.cc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -478,16 +478,7 @@ const Status& ErrorHandler::SetBGError(const IOStatus& bg_io_err,
478478
return StartRecoverFromRetryableBGIOError(bg_io_err);
479479
} else {
480480
Status bg_err(new_bg_io_err, Status::Severity::kHardError);
481-
if (recovery_in_prog_ && recovery_error_.ok()) {
482-
recovery_error_ = bg_err;
483-
}
484-
if (bg_err.severity() > bg_error_.severity()) {
485-
bg_error_ = bg_err;
486-
}
487-
if (bg_error_.severity() >= Status::Severity::kHardError) {
488-
stop_state_.store(true, std::memory_order_release);
489-
}
490-
//CheckAndSetRecoveryAndBGError(bg_err);
481+
CheckAndSetRecoveryAndBGError(bg_err);
491482
recover_context_ = context;
492483
return StartRecoverFromRetryableBGIOError(bg_io_err);
493484
}

0 commit comments

Comments
 (0)