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

[FEAT MERGE] merge transfer

Browse Source 
Co-authored-by: wxhwang <wxhwang@126.com>
Co-authored-by: godyangfight <godyangfight@gmail.com>
Co-authored-by: Tyshawn <tuyunshan@gmail.com>
This commit is contained in:
xuhuleon
2023-06-21 11:42:26 +00:00
committed by ob-robot
parent d06678002e
commit 9dae112952
1280 changed files with 149724 additions and 48813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/rootserver/backup/ob_backup_clean_task_mgr.cpp
View File

@ -14,7 +14,7 @@
#include "ob_backup_clean_task_mgr.h"
#include "ob_backup_clean_ls_task_mgr.h"
#include "storage/ls/ob_ls.h"
#include "share/backup/ob_backup_data_store.h"
#include "storage/backup/ob_backup_data_store.h"
#include "share/backup/ob_backup_path.h"
#include "share/backup/ob_backup_struct.h"
#include "share/backup/ob_backup_clean_struct.h"
@ -45,7 +45,6 @@ ObBackupCleanTaskMgr::ObBackupCleanTaskMgr()
job_attr_(nullptr),
sql_proxy_(nullptr),
rpc_proxy_(nullptr),
lease_service_(nullptr),
task_scheduler_(nullptr),
backup_service_(nullptr)
{
@ -58,8 +57,7 @@ int ObBackupCleanTaskMgr::init(
common::ObISQLClient &sql_proxy,
obrpc::ObSrvRpcProxy &rpc_proxy,
ObBackupTaskScheduler &task_scheduler,
ObBackupLeaseService &lease_service,
ObBackupService &backup_service)
ObBackupCleanService &backup_service)
{
int ret = OB_SUCCESS;
if (IS_INIT) {
@ -99,7 +97,6 @@ int ObBackupCleanTaskMgr::init(
job_attr_ = &job_attr;
sql_proxy_ = &sql_proxy;
rpc_proxy_ = &rpc_proxy;
lease_service_ = &lease_service;
task_scheduler_ = &task_scheduler;
backup_service_ = &backup_service;
is_inited_ = true;
@ -115,8 +112,8 @@ int ObBackupCleanTaskMgr::advance_task_status_(
const int64_t end_ts)
{
int ret = OB_SUCCESS;
if (OB_FAIL(lease_service_->check_lease())) {
LOG_WARN("failed to check lease", K(ret));
if (OB_FAIL(backup_service_->check_leader())) {
LOG_WARN("failed to check leader", K(ret));
} else if (OB_FAIL(ObBackupCleanTaskOperator::advance_task_status(sql_proxy, task_attr_, next_status, result, end_ts))) {
LOG_WARN("failed to advance set status", K(ret), K(task_attr_), K(next_status));
}
@ -387,8 +384,8 @@ int ObBackupCleanTaskMgr::persist_ls_tasks_()
new_ls_attr.reset();
if (OB_FAIL(generate_ls_task_(ls_id, new_ls_attr))) {
LOG_WARN("failed to generate log stream tasks", K(ret), K(ls_ids));
} else if (OB_FAIL(lease_service_->check_lease())) {
LOG_WARN("failed to check lease", K(ret));
} else if (OB_FAIL(backup_service_->check_leader())) {
LOG_WARN("failed to check leader", K(ret));
} else if (OB_FAIL(ObBackupCleanLSTaskOperator::insert_ls_task(trans, new_ls_attr))) {
LOG_WARN("failed to insert backup log stream task", K(ret), K(new_ls_attr));
}
@ -1065,7 +1062,7 @@ int ObBackupCleanTaskMgr::do_backup_clean_ls_tasks_(
job_attr_->can_retry_ = false;
ret = ls_attr.result_;
LOG_WARN("retry times exceeds the limit", K(ret), K(ls_attr.retry_id_), K(ls_attr.ls_id_), K(task_attr_), K(job_attr_->can_retry_));
} else if (OB_FAIL(ls_task_mgr.init(task_attr_, ls_attr, *task_scheduler_, *sql_proxy_, *lease_service_, *backup_service_))) {
} else if (OB_FAIL(ls_task_mgr.init(task_attr_, ls_attr, *task_scheduler_, *sql_proxy_, *backup_service_))) {
LOG_WARN("failed to init task advancer", K(ret), K(ls_attr));
} else if (OB_FAIL(ls_task_mgr.process(finish_cnt))) {
LOG_WARN("failed to process log stream task", K(ret));
@ -1151,7 +1148,7 @@ int ObBackupCleanTaskMgr::do_failed_ls_task_(
} else if (OB_SUCCESS == result) {
result = ls_attr.result_;
}
} else if (OB_FAIL(ls_task_mgr.init(task_attr_, ls_attr, *task_scheduler_, sql_proxy, *lease_service_, *backup_service_))) {
} else if (OB_FAIL(ls_task_mgr.init(task_attr_, ls_attr, *task_scheduler_, sql_proxy, *backup_service_))) {
LOG_WARN("failed to init task mgr", K(ret), K(ls_attr));
} else if (OB_FAIL(ls_task_mgr.cancel(finish_cnt))) {
LOG_WARN("failed to cancel task", K(ret));
@ -1176,8 +1173,8 @@ int ObBackupCleanTaskMgr::do_cleanup()
int ObBackupCleanTaskMgr::move_task_to_history_()
{
int ret = OB_SUCCESS;
if (OB_FAIL(lease_service_->check_lease())) {
LOG_WARN("failed to check lease", K(ret));
if (OB_FAIL(backup_service_->check_leader())) {
LOG_WARN("failed to check leader", K(ret));
} else if (OB_FAIL(ObBackupCleanLSTaskOperator::move_ls_to_his(*sql_proxy_, task_attr_.tenant_id_, task_attr_.task_id_))) {
LOG_WARN("failed to move ls task to history", K(ret));
} else if (OB_FAIL(ObBackupCleanTaskOperator::move_task_to_history(*sql_proxy_, task_attr_.tenant_id_, task_attr_.task_id_))) {
@ -1210,7 +1207,7 @@ int ObBackupCleanTaskMgr::do_cancel_()
if (OB_SUCCESS == ls_attr.result_) {
success_ls_count++;
}
} else if (OB_FAIL(task_mgr.init(task_attr_, ls_attr, *task_scheduler_, trans, *lease_service_, *backup_service_))) {
} else if (OB_FAIL(task_mgr.init(task_attr_, ls_attr, *task_scheduler_, trans, *backup_service_))) {
LOG_WARN("failed to init task mgr", K(ret), K(ls_attr));
} else if (OB_FAIL(task_mgr.cancel(finish_cnt))) {
LOG_WARN("failed to cancel task", K(ret));