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

Fix open source backup disk full may caused dead lock

Browse Source
This commit is contained in:
mw0
2021-10-13 11:59:14 +08:00
committed by wangzelin.wzl
parent 6054dfb5fb
commit 3dfbfef7c1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/storage/ob_partition_backup.cpp
View File

@ -269,6 +269,10 @@ int ObPartGroupBackupTask::do_backup_task(const ObBackupDataType &backup_data_ty
if (OB_SUCCESS != (tmp_ret = check_disk_space())) { if (OB_SUCCESS != (tmp_ret = check_disk_space())) {
STORAGE_LOG(WARN, "failed to check disk space", K(tmp_ret)); STORAGE_LOG(WARN, "failed to check disk space", K(tmp_ret));
common::SpinWLockGuard guard(lock_);
if (OB_SUCCESS == first_error_code_) {
first_error_code_ = ret;
}
} }
if (OB_SUCCESS != (tmp_ret = try_schedule_new_partition_backup(backup_data_type))) { if (OB_SUCCESS != (tmp_ret = try_schedule_new_partition_backup(backup_data_type))) {
@ -723,7 +727,7 @@ int ObPartGroupBackupTask::check_pg_backup_point_created(
if (ObPartGroupMigrator::get_instance().is_stop()) { if (ObPartGroupMigrator::get_instance().is_stop()) {
ret = OB_SERVER_IS_STOPPING; ret = OB_SERVER_IS_STOPPING;
STORAGE_LOG(WARN, "server is stopping", K(ret)); STORAGE_LOG(WARN, "server is stopping", K(ret));
} else if (OB_FAIL(check_disk_space())) { } else if (OB_FAIL(check_disk_space())) {
LOG_WARN("failed to check disk space", K(ret)); LOG_WARN("failed to check disk space", K(ret));
break; break;
} else if (OB_FAIL(SYS_TASK_STATUS_MGR.is_task_cancel(task_id_, is_cancel))) { } else if (OB_FAIL(SYS_TASK_STATUS_MGR.is_task_cancel(task_id_, is_cancel))) {
@ -789,10 +793,6 @@ int ObPartGroupBackupTask::check_disk_space()
} else if (OB_FAIL(OB_STORE_FILE.check_disk_full(required_size))) { } else if (OB_FAIL(OB_STORE_FILE.check_disk_full(required_size))) {
ObTaskController::get().allow_next_syslog(); ObTaskController::get().allow_next_syslog();
STORAGE_LOG(WARN, "failed to check_is_disk_full, cannot backup", K(ret), K(required_size)); STORAGE_LOG(WARN, "failed to check_is_disk_full, cannot backup", K(ret), K(required_size));
common::SpinWLockGuard guard(lock_);
if (OB_SUCCESS == first_error_code_) {
first_error_code_ = ret;
}
} }
#ifdef ERRSIM #ifdef ERRSIM