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

[bugfix] fix request leak in handle_retry_req

Browse Source
This commit is contained in:
obdev
2024-04-25 12:08:58 +00:00
committed by ob-robot
parent 1d8ebf3f45
commit 1fba63fb19
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1610,23 +1610,22 @@ void ObTenant::handle_retry_req(bool need_clear)
int ret = OB_SUCCESS;
ObLink* task = nullptr;
ObRequest *req = NULL;
while (OB_SUCC(ret) && OB_SUCC(retry_queue_.pop(task, need_clear))) {
// even if ret != OB_SUCCESS, the loop must continue to pop all requests
while (OB_SUCC(retry_queue_.pop(task, need_clear))) {
// if pop returns OB_SUCCESS, then the task must not be NULL.
req = static_cast<rpc::ObRequest*>(task);
if (nullptr != req) {
if (req->large_retry_flag()) {
if (OB_FAIL(recv_large_request(*req))) {
on_translate_fail(req, ret);
LOG_WARN("tenant patrol push req into large_query queue fail", "tenant_id", id_, K(ret));
}
} else {
if (OB_FAIL(recv_request(*req))) {
on_translate_fail(req, ret);
LOG_WARN("tenant patrol push req into common queue fail", "tenant_id", id_, K(ret));
}
if (req->large_retry_flag()) {
if (OB_FAIL(recv_large_request(*req))) {
LOG_WARN("tenant patrol push req into large_query queue fail, "
"and the req well be destroyed", "tenant_id", id_, "req", *req, K(ret));
on_translate_fail(req, ret);
}
} else {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("the req is NULL", "tenant_id", id_, K(ret));
if (OB_FAIL(recv_request(*req))) {
LOG_WARN("tenant patrol push req into common queue fail, "
"and the req well be destroyed", "tenant_id", id_, "req", *req, K(ret));
on_translate_fail(req, ret);
}
}
}
}