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

Fix clean sequence cache easy to timeout

Browse Source
This commit is contained in:
hezuojiao
2022-11-22 04:35:33 +00:00
committed by wangzelin.wzl
parent c18134e07f
commit 429f2f7d5a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/schema/ob_sequence_sql_service.cpp
View File

@ -142,7 +142,6 @@ int ObSequenceSqlService::clean_sequence_cache(uint64_t tenant_id, uint64_t sequ
ObSEArray<ObAddr, 8> server_list; ObSEArray<ObAddr, 8> server_list;
ObSrvRpcProxy srv_rpc_proxy; ObSrvRpcProxy srv_rpc_proxy;
ObUnitInfoGetter ui_getter; ObUnitInfoGetter ui_getter;
static const int64_t OB_CLEAN_SEQUENCE_CACHE_TIMEOUT = 1000 * 1000; // 1s
if (OB_ISNULL(GCTX.sql_proxy_) || OB_ISNULL(GCTX.net_frame_) || OB_ISNULL(GCTX.net_frame_->get_req_transport())) { if (OB_ISNULL(GCTX.sql_proxy_) || OB_ISNULL(GCTX.net_frame_) || OB_ISNULL(GCTX.net_frame_->get_req_transport())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("sql_proxy or net_frame in GCTX is null", K(GCTX.sql_proxy_), K(GCTX.net_frame_)); LOG_WARN("sql_proxy or net_frame in GCTX is null", K(GCTX.sql_proxy_), K(GCTX.net_frame_));
@ -154,10 +153,11 @@ int ObSequenceSqlService::clean_sequence_cache(uint64_t tenant_id, uint64_t sequ
LOG_WARN("fail to init srv rpc proxy", KR(ret)); LOG_WARN("fail to init srv rpc proxy", KR(ret));
} else { } else {
for (int i = 0; OB_SUCC(ret) && i < server_list.count(); ++i) { for (int i = 0; OB_SUCC(ret) && i < server_list.count(); ++i) {
const uint64_t timeout = THIS_WORKER.get_timeout_remain();
if (OB_FAIL(srv_rpc_proxy if (OB_FAIL(srv_rpc_proxy
.to(server_list.at(i)) .to(server_list.at(i))
.by(tenant_id) .by(tenant_id)
.timeout(OB_CLEAN_SEQUENCE_CACHE_TIMEOUT) .timeout(timeout)
.clean_sequence_cache(sequence_id))) { .clean_sequence_cache(sequence_id))) {
LOG_WARN("clean sequnece cache failed", K(ret), K(sequence_id), K(server_list.at(i))); LOG_WARN("clean sequnece cache failed", K(ret), K(sequence_id), K(server_list.at(i)));
} }