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

[CP] [42x]fix shrink unit_num from 3 to 1 trigger type_transform problem

Browse Source
This commit is contained in:
joseph12138 2024-04-17 13:32:55 +00:00 committed by ob-robot
parent f143ab3f5e
commit c1e1c63d9f
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootserver/ob_disaster_recovery_worker.cpp
View File

@ -2063,17 +2063,6 @@ int ObDRWorker::try_tenant_disaster_recovery(
return ret;
}
int ObDRWorker::try_assign_unit(
DRLSInfo &dr_ls_info)
{
int ret = OB_SUCCESS;
/* TODO: (wenduo)
* try assign unit_id/unit_group_id for replicas with invalid unit_id/unit_group_id
*/
UNUSED(dr_ls_info);
return ret;
}
int ObDRWorker::try_ls_disaster_recovery(
const bool only_for_display,
DRLSInfo &dr_ls_info,
@ -3958,6 +3947,10 @@ int ObDRWorker::find_valid_readonly_replica_(
&& server_stat_info->is_alive()
&& !server_stat_info->is_stopped()
&& !replica->get_restore_status().is_failed()
// TODO@zhennan: after transfer partition cp to master, this condition(unit_stat_info->get_unit().is_active_status())
// should change to (unit_stat_info->get_unit().is_active_status() || OB_NOT_NULL(specified_unit_in_group))
// Also make sure add jingyu_alter_unit_group_for_ls_with_several_r_replicas.test back
&& unit_stat_info->get_unit().is_active_status()
&& unit_stat_info->get_server_stat()->is_alive()
&& !unit_stat_info->get_server_stat()->is_block()) {
if (OB_FAIL(target_replica.assign(*replica))) {

3
src/rootserver/ob_disaster_recovery_worker.h
View File

@ -659,9 +659,6 @@ private:
ObZoneManager &zone_mgr,
bool &locality_is_matched);
int try_assign_unit(
DRLSInfo &dr_ls_info);
int start();
void statistic_remain_dr_task();