hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix race condition when slog write failed

Browse Source
This commit is contained in:
hiddenbomb 2021-09-27 21:29:42 +08:00 committed by wangzelin.wzl
parent febfa4863f
commit 4a2b2145a7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/blocksstable/slog/ob_storage_log_writer.cpp
View File

@ -738,22 +738,24 @@ int ObStorageLogWriter::process_logs_in_batch(
}
}
if (OB_FAIL(ret)) { // wake up logs not sync
if (OB_FAIL(ret)) {
// wake up logs not sync
for (int64_t i = sync_index + 1; i < item_cnt; ++i) {
if (NULL == items[i]) {
if (OB_ISNULL(items[i])) {
LOG_ERROR("log_item in items is null", K(ret), KP(items[i]));
} else {
ObStorageLogItem* log_item = reinterpret_cast<ObStorageLogItem*>(items[i]);
ObStorageLogItem *log_item = reinterpret_cast<ObStorageLogItem *>(items[i]);
if (i == sync_index + 1) {
// set build cursor and write cursor with the specified log item in queue
ObMutexGuard guard(build_log_mutex_);
build_cursor_ = log_item->start_cursor_;
write_cursor_ = log_item->start_cursor_;
}
// aggregate_logs_to_buffer may fail for invalid cursor arguments,
// we just finish flush and let upper layer retry
log_item->finish_flush(ret);
}
}
ObMutexGuard guard(build_log_mutex_);
ObStorageLogItem* log_item = reinterpret_cast<ObStorageLogItem*>(items[sync_index + 1]);
build_cursor_ = log_item->start_cursor_;
write_cursor_ = log_item->start_cursor_;
LOG_ERROR("slog write failed, record cursor", K(ret), K_(build_cursor), K_(write_cursor));
}
finish_cnt = item_cnt;
@ -775,7 +777,7 @@ int ObStorageLogWriter::prepare_fd(const int64_t file_id)
// close last log file opened
if (-1 != cur_file_id_ && OB_FAIL(file_store_->close())) {
ret = OB_IO_ERROR;
LOG_ERROR("close error", K_(cur_file_id), KERRMSG);
LOG_ERROR("close error", K_(cur_file_id), K(file_id), KERRMSG);
}
if (OB_SUCC(ret)) {