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

fix rs merge tablet info report -9011

Browse Source
This commit is contained in:
oceanoverflow
2023-12-25 02:48:15 +00:00
committed by ob-robot
parent 28736c0505
commit aaa925147a
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rootserver/backup/ob_backup_data_set_task_mgr.cpp
View File

@ -1604,8 +1604,13 @@ int ObBackupSetTaskMgr::convert_task_type_(const ObIArray<ObBackupLSTaskAttr> &l
new_ls_task.result_ = OB_SUCCESS; new_ls_task.result_ = OB_SUCCESS;
new_ls_task.dst_.reset(); new_ls_task.dst_.reset();
new_ls_task.task_trace_id_.reset(); new_ls_task.task_trace_id_.reset();
new_ls_task.retry_id_ = 0; // backup meta finish need reuse the turn id and retry id to merge tablet infos
new_ls_task.turn_id_ = 1; // so that the turn id and retry id of backup meta finish
// is the same as the turn id and retry id of backup meta
if (ObBackupDataTaskType::Type::BACKUP_META_FINISH != type.type_) {
new_ls_task.retry_id_ = 0;
new_ls_task.turn_id_ = 1;
}
if (OB_FAIL(backup_service_->check_leader())) { if (OB_FAIL(backup_service_->check_leader())) {
LOG_WARN("failed to check leader", K(ret)); LOG_WARN("failed to check leader", K(ret));
} else if (OB_FAIL(ObBackupLSTaskOperator::report_ls_task(trans_, new_ls_task))) { } else if (OB_FAIL(ObBackupLSTaskOperator::report_ls_task(trans_, new_ls_task))) {

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

@ -3665,7 +3665,27 @@ int ObLSBackupMetaTask::process()
DEBUG_SYNC(BEFORE_BACKUP_1001_META); DEBUG_SYNC(BEFORE_BACKUP_1001_META);
} }
#endif #endif
if (IS_NOT_INIT) { #ifdef ERRSIM
if (OB_SUCC(ret)) {
if (ls_id.is_sys_ls()) {
ret = OB_E(EventTable::EN_BACKUP_SYS_META_TASK_FAILED) OB_SUCCESS;
} else {
ret = OB_E(EventTable::EN_BACKUP_USER_META_TASK_FAILED) OB_SUCCESS;
}
if (OB_FAIL(ret)) {
SERVER_EVENT_SYNC_ADD("backup_errsim", "backup_meta",
"tenant_id", param_.tenant_id_,
"task_id", param_.job_desc_.task_id_,
"ls_id", param_.ls_id_.id(),
"turn_id", param_.turn_id_,
"retry_id", param_.retry_id_);
LOG_WARN("errsim backup meta task failed", K(ret));
}
}
#endif
if (OB_FAIL(ret)) {
// do nothing
} else if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("backup meta task do not init", K(ret)); LOG_WARN("backup meta task do not init", K(ret));
} else { } else {
@ -3682,19 +3702,6 @@ int ObLSBackupMetaTask::process()
} }
} }
#ifdef ERRSIM
if (OB_SUCC(ret)) {
if (ls_id.is_sys_ls()) {
ret = OB_E(EventTable::EN_BACKUP_SYS_META_TASK_FAILED) OB_SUCCESS;
} else {
ret = OB_E(EventTable::EN_BACKUP_USER_META_TASK_FAILED) OB_SUCCESS;
}
if (OB_FAIL(ret)) {
SERVER_EVENT_SYNC_ADD("backup_errsim", "backup_meta");
LOG_WARN("errsim backup meta task failed", K(ret));
}
}
#endif
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
bool is_set = false; bool is_set = false;
ls_backup_ctx_->set_result_code(ret, is_set); ls_backup_ctx_->set_result_code(ret, is_set);