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

check if backup failed in get items loop

Browse Source
This commit is contained in:
oceanoverflow
2023-03-28 12:44:46 +00:00
committed by ob-robot
parent 838ac9a4e2
commit d4927e05d6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/backup/ob_backup_task.cpp
View File

@ -2119,7 +2119,9 @@ int ObPrefetchBackupInfoTask::inner_process_()
if (OB_SUCC(ret)) {
ObArray<ObBackupProviderItem> items;
int64_t file_id = 0;
if (OB_FAIL(task_mgr_->deliver(items, file_id))) {
if (OB_SUCCESS != ls_backup_ctx_->get_result_code()) {
LOG_INFO("backup task already failed", "result_code", ls_backup_ctx_->get_result_code());
} else if (OB_FAIL(task_mgr_->deliver(items, file_id))) {
if (OB_EAGAIN == ret) {
ret = OB_SUCCESS;
if (!is_run_out) {

8
src/storage/backup/ob_backup_utils.cpp
View File

@ -1512,6 +1512,9 @@ int ObBackupTabletProvider::get_next_batch_items(common::ObIArray<ObBackupProvid
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("backup tablet provider do not init", K(ret));
} else if (OB_ISNULL(ls_backup_ctx_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ls backup ctx should not be null", K(ret));
} else if (OB_FAIL(prepare_batch_tablet_(tenant_id, ls_id))) {
LOG_WARN("failed to prepare batch tablet", K(ret), K(tenant_id), K(ls_id));
} else {
@ -1528,7 +1531,10 @@ int ObBackupTabletProvider::get_next_batch_items(common::ObIArray<ObBackupProvid
#endif
while (OB_SUCC(ret)) {
tmp_items.reset();
if (OB_FAIL(inner_get_batch_items_(batch_size, tmp_items))) {
if (OB_SUCCESS != ls_backup_ctx_->get_result_code()) {
LOG_INFO("backup task already failed", "result_code", ls_backup_ctx_->get_result_code());
break;
} else if (OB_FAIL(inner_get_batch_items_(batch_size, tmp_items))) {
LOG_WARN("failed to inner get batch item", K(ret), K(batch_size));
} else if (tmp_items.empty() && meet_end_) {
is_run_out_ = true;