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

[FEAT MERGE] 开源裁减颗粒度优化

Browse Source 
Co-authored-by: nroskill <nroskill@gmail.com>
Co-authored-by: akaError <lzg020616@163.com>
Co-authored-by: yinyj17 <yinyijun92@gmail.com>
This commit is contained in:
wenxingsen
2023-08-15 02:40:25 +00:00
committed by ob-robot
parent a31e422133
commit 9b31f8aa03
378 changed files with 26718 additions and 2379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rootserver/backup/ob_archive_scheduler_service.cpp
View File

@ -393,7 +393,8 @@ void ObArchiveSchedulerService::set_checkpoint_interval_(const int64_t interval_
int ObArchiveSchedulerService::open_archive_mode(const uint64_t tenant_id, const common::ObIArray<uint64_t> &archive_tenant_ids)
{
// TODO: print error trace to user
// TODO(wangxiaohui.wxh):4.3, print error trace to user
int ret = OB_SUCCESS;
ObArray<uint64_t> bak_archive_tenant_ids;
if (IS_NOT_INIT) {
@ -430,7 +431,8 @@ int ObArchiveSchedulerService::open_archive_mode(const uint64_t tenant_id, const
int ObArchiveSchedulerService::open_tenant_archive_mode_(
const common::ObIArray<uint64_t> &tenant_ids_array)
{
// TODO: return failed if any tenant failed
// TODO(wangxiaohui.wxh):4.3, return failed if any tenant failed
int ret = OB_SUCCESS;
for (int64_t i = 0; i < tenant_ids_array.count(); i++) {
int tmp_ret = OB_SUCCESS;

2
src/rootserver/backup/ob_backup_clean_scheduler.cpp
View File

@ -1255,7 +1255,7 @@ int ObUserTenantBackupDeleteMgr::get_delete_backup_set_infos_(ObArray<ObBackupSe
int ObUserTenantBackupDeleteMgr::get_delete_backup_piece_infos_(ObArray<ObTenantArchivePieceAttr> &piece_list)
{
int ret = OB_SUCCESS;
// TODO 4.1 support
// TODO(wenjinyu.wjy) 4.3 support
return ret;
}

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

@ -101,7 +101,7 @@ int ObBackupCleanTaskMgr::init(
backup_service_ = &backup_service;
is_inited_ = true;
}
// TODO: integrate sql_proxy and lease_service 4.1
// TODO(wenjinyu.wjy): integrate sql_proxy and lease_service 4.3
return ret;
}
@ -604,6 +604,7 @@ int ObBackupCleanTaskMgr::get_ls_ids_from_traverse_(const ObBackupPath &path, Ob
LOG_WARN("failed to set log stream prefix", K(ret));
} else if (OB_FAIL(prefix_op.init(logstream_prefix, strlen(logstream_prefix)))) {
LOG_WARN("failed to init dir prefix", K(ret), K(logstream_prefix));
// TODO(wenjinyu.wjy) iterate dir sequentially 4.3
} else if (OB_FAIL(util.list_directories(path.get_obstr(), backup_dest_.get_storage_info(), prefix_op))) {
LOG_WARN("failed to list files", K(ret));
} else {
@ -761,6 +762,7 @@ int ObBackupCleanTaskMgr::delete_data_info_turn_files_(const ObBackupPath &infos
ObDirPrefixEntryNameFilter prefix_op(d_entrys);
if (OB_FAIL(prefix_op.init(info_turn_prefix, strlen(info_turn_prefix)))) {
LOG_WARN("failed to init dir prefix", K(ret), K(info_turn_prefix));
// TODO(wenjinyu.wjy) iterate dir sequentially 4.3
} else if (OB_FAIL(util.list_directories(infos_path.get_obstr(), backup_dest_.get_storage_info(), prefix_op))) {
LOG_WARN("failed to list directories", K(ret));
} else {

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

@ -1218,7 +1218,9 @@ int ObBackupSetTaskMgr::update_inner_task_(
if (nullptr == ls_attr) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("[DATA_BACKUP]null ls ptr", K(ret));
// TODO use another error code to determine change turn in 4.1
// else if (OB_LS_NOT_EXIST == ls_attr->result_) {
// LOG_WARN("[DATA_BACKUP]ls has been delete, need not to redo backup", K(ret), "ls_id", ls_attr->ls_id_);
// } // TODO(yangyi.yyy): use another error code to determine change turn in 4.1
} else if (OB_FAIL(calc_task_turn_(ls_attr->task_type_, turn_id))) {
LOG_WARN("failed to calc task turn id", K(ret));
} else if (OB_FAIL(ObBackupDataLSTaskMgr::redo_ls_task(

4
src/rootserver/backup/ob_backup_service.cpp
View File

@ -321,7 +321,7 @@ int ObBackupCleanService::handle_backup_delete(const obrpc::ObBackupCleanArg &ar
};
case ObNewBackupCleanType::DELETE_BACKUP_SET:
case ObNewBackupCleanType::DELETE_BACKUP_PIECE: {
// TODO 4.1 support delete backup set/piece
// TODO(wenjinyu.wjy) 4.3 support delete backup set/piece
ret = OB_NOT_SUPPORTED;
break;
};
@ -333,7 +333,7 @@ int ObBackupCleanService::handle_backup_delete(const obrpc::ObBackupCleanArg &ar
break;
};
case ObNewBackupCleanType::DELETE_BACKUP_ALL: {
// TODO 4.1 support delete backup all function
// TODO(wenjinyu.wjy) 4.3 support delete backup all function
ret = OB_NOT_SUPPORTED;
break;
};

3
src/rootserver/backup/ob_backup_task_scheduler.cpp
View File

@ -277,7 +277,8 @@ int ObBackupTaskSchedulerQueue::pop_task(ObBackupScheduleTask *&output_task, com
DLIST_FOREACH(t, wait_list_)
{
if (!backup_zone.empty() || !backup_region.empty()) {
// TODO: when backup zone and backup region scheme is ready, adjust this code.
// TODO(chongrong.th): when backup zone and backup region scheme is ready, adjust this code in 4.3
// only backup ls task need the defensive operation
ObArray<common::ObAddr> empty_block_server;
if (!t->can_execute_on_any_server() && BackupJobType::BACKUP_BACKUP_DATA_JOB == t->get_type()) {
ObBackupDataLSTask *tmp_task = static_cast<ObBackupDataLSTask *>(t);