Merge branch issue/45639702 into master

This commit is contained in:
obdev 2022-10-25 14:25:12 +08:00 committed by wangzelin.wzl
parent 0f95b69cd4
commit f6e8a07bcc

View File

@ -64,16 +64,14 @@ int ObInterruptUtil::broadcast_dfo(ObDfo *dfo, int code)
// 暂存上次的 id,inc_seqnum 将修改 px_interrupt_id_
ObInterruptibleTaskID interrupt_id = dfo->get_interrupt_id().px_interrupt_id_;
for (int64_t j = 0; j < sqcs.count(); ++j) {
if (sqcs.at(j)->need_report()) {
const ObAddr &addr = sqcs.at(j)->get_exec_addr();
if(OB_SUCCESS != (tmp_ret = manager->interrupt(addr, interrupt_id, int_code))) {
ret = tmp_ret;
LOG_WARN("fail to send interrupt message to other server",
K(ret), K(int_code), K(addr), K(interrupt_id));
} else {
LOG_INFO("success to send interrupt message",
K(int_code), K(addr), K(interrupt_id));
}
const ObAddr &addr = sqcs.at(j)->get_exec_addr();
if(OB_SUCCESS != (tmp_ret = manager->interrupt(addr, interrupt_id, int_code))) {
ret = tmp_ret;
LOG_WARN("fail to send interrupt message to other server",
K(ret), K(int_code), K(addr), K(interrupt_id));
} else {
LOG_INFO("success to send interrupt message",
K(int_code), K(addr), K(interrupt_id));
}
}
}