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

[CP] fix hang at dfo scheduler wait_all

Browse Source
This commit is contained in:
sdc
2023-12-26 03:18:29 +00:00
committed by ob-robot
parent d7ae28defd
commit 36f9cecbc7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/engine/px/ob_px_sqc_async_proxy.cpp
View File

@ -161,16 +161,15 @@ int ObPxSqcAsyncProxy::wait_all() {
// 1. 在有效时间内获得足够多并且正确的callback结果 // 1. 在有效时间内获得足够多并且正确的callback结果
// 2. 超时，ret = OB_TIMEOUT // 2. 超时，ret = OB_TIMEOUT
// 3. retry一个rpc失败 // 3. retry一个rpc失败
oceanbase::lib::Thread::WaitGuard guard(oceanbase::lib::Thread::WAIT_FOR_PX_MSG);
while (return_cb_count_ < sqcs_.count() && OB_SUCC(ret)) { while (return_cb_count_ < sqcs_.count() && OB_SUCC(ret)) {
ObThreadCondGuard guard(cond_); ObThreadCondGuard guard(cond_);
// wait for timeout or until notified. // wait for timeout or until notified.
cond_.wait_us(500); cond_.wait_us(500);
if ((phy_plan_ctx_->get_timeout_timestamp() - if (OB_FAIL(exec_ctx_.fast_check_status())) {
ObTimeUtility::current_time()) < 0) { LOG_WARN("check status failed", K(ret));
// 超过查询计划的timeout，满足退出条件2
ret = OB_TIMEOUT;
} }
ARRAY_FOREACH_X(callbacks_, idx, count, OB_SUCC(ret)) { ARRAY_FOREACH_X(callbacks_, idx, count, OB_SUCC(ret)) {