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

[CP] fix request leak if failed to GC last worker.

Browse Source
This commit is contained in:
zhjc1124
2024-02-26 03:16:04 +00:00
committed by ob-robot
parent 9541f0f185
commit 1cd336f3d8
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/observer/omt/ob_tenant.cpp
View File

@ -539,10 +539,36 @@ int ObResourceGroup::clear_worker()
{
int ret = OB_SUCCESS;
ObMutexGuard guard(workers_lock_);
while (req_queue_.size() > 0
|| (multi_level_queue_.get_total_size() > 0)) {
ob_usleep(10L * 1000L);
int tmp_ret = OB_SUCCESS;
const int64_t timeout = 10 * 1000;
ObLink* task = nullptr;
rpc::ObRequest *req = nullptr;
while (req_queue_.size() > 0) {
if (OB_TMP_FAIL(req_queue_.pop(task, timeout))) {
LOG_WARN("req queue pop task fail", K(tmp_ret), K(&req_queue_));
} else if (NULL != task) {
req = static_cast<rpc::ObRequest*>(task);
on_translate_fail(req, OB_TENANT_NOT_IN_SERVER);
} else {
LOG_ERROR("req queue pop successfully but task is NULL");
}
}
for (int32_t level = 0; level < MULTI_LEVEL_QUEUE_SIZE; level++) {
while (multi_level_queue_.get_size(level) > 0) {
if (OB_TMP_FAIL(multi_level_queue_.pop(task, level, timeout))) {
LOG_WARN("req queue pop task fail", K(tmp_ret), K(&multi_level_queue_));
} else if (NULL != task) {
req = static_cast<rpc::ObRequest*>(task);
on_translate_fail(req, OB_TENANT_NOT_IN_SERVER);
} else {
LOG_ERROR("multi level queue pop successfully but task is NULL");
}
}
}
while (nesting_workers_.get_size() > 0) {
int ret = OB_SUCCESS;
DLIST_FOREACH_REMOVESAFE(wnode, nesting_workers_) {