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

[CP] [OBCDC] Support ignore remove tablet operation in case of observer behave unexpected

Browse Source
This commit is contained in:
SanmuWangZJU 2023-10-12 11:09:53 +00:00 committed by ob-robot
parent f5e655466f
commit 8535879c8f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/libobcdc/src/ob_log_config.h
View File

@ -418,6 +418,8 @@ public:
T_DEF_INT(msg_sorter_thread_num, OB_CLUSTER_PARAMETER, 1, 1, 32, "trans msg sorter thread num");
// sorter thread
T_DEF_INT_INFT(msg_sorter_task_count_upper_limit, OB_CLUSTER_PARAMETER, 0, 0, "trans msg sorter task count per thread");
// ignore delete tablets
T_DEF_BOOL(skip_delete_tablet_op, OB_CLUSTER_PARAMETER, 0, "0:disabled 1:enabled");
// ------------------------------------------------------------------------
// Test mode, used only in obtest and other test tool scenarios

10
src/logservice/libobcdc/src/ob_log_sequencer1.cpp
View File

@ -964,8 +964,16 @@ int ObLogSequencer::handle_multi_data_source_info_(
LOG_DEBUG("CDC_CREATE_TABLET", KR(ret), K(tablet_change_info), K(part_trans_task), KPC(part_trans_task), K(tenant));
}
} else if (tablet_change_info.is_delete_tablet_op()) {
const bool skip_delete_tablet_op = (1 == TCONF.skip_delete_tablet_op);
if (OB_UNLIKELY(skip_delete_tablet_op)) {
LOG_INFO("[IGNORE][CDC_DELETE_TABLET]",
"tls_id", part_trans_task->get_tls_id(),
"trans_id", trans_ctx.get_trans_id(),
K(tablet_change_info),
"op_tablets", tablet_change_info.get_delete_tablet_op_arr());
// 1. delete tablet should wait all task in dml_parse done.
if (OB_FAIL(wait_until_parser_done_("delete_tablet_op", stop_flag))) {
} else if (OB_FAIL(wait_until_parser_done_("delete_tablet_op", stop_flag))) {
if (OB_IN_STOP_STATE != ret) {
LOG_ERROR("wait_until_parser_done_ failed", KR(ret), KPC(part_trans_task));
}