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

[BUGFIX] fix lob remote query timeout

Browse Source
This commit is contained in:
obdev
2023-03-08 14:10:55 +00:00
committed by ob-robot
parent 83ca7f5f2e
commit ba782bb0cc
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/lob/ob_lob_manager.cpp
View File

@ -453,10 +453,14 @@ int ObLobManager::query_remote(ObLobAccessParam& param, common::ObAddr& dst_addr
arg.lob_locator_.ptr_ = param.lob_locator_->ptr_;
arg.lob_locator_.size_ = param.lob_locator_->size_;
arg.lob_locator_.has_lob_header_ = param.lob_locator_->has_lob_header_;
int64_t timeout = param.timeout_ - ObTimeUtility::current_time();
if (timeout < ObStorageRpcProxy::STREAM_RPC_TIMEOUT) {
timeout = ObStorageRpcProxy::STREAM_RPC_TIMEOUT;
}
ret = svr_rpc_proxy->to(dst_addr).by(arg.tenant_id_)
.dst_cluster_id(GCONF.cluster_id)
.ratelimit(true).bg_flow(obrpc::ObRpcProxy::BACKGROUND_FLOW)
.timeout(ObStorageRpcProxy::STREAM_RPC_TIMEOUT)
.timeout(timeout)
.lob_query(arg, rpc_buffer, handle);
if (OB_FAIL(ret)) {
LOG_WARN("failed to do remote query", K(ret));
@ -1808,10 +1812,14 @@ int ObLobManager::getlength_remote(ObLobAccessParam& param, common::ObAddr& dst_
arg.lob_locator_.ptr_ = param.lob_locator_->ptr_;
arg.lob_locator_.size_ = param.lob_locator_->size_;
arg.lob_locator_.has_lob_header_ = param.lob_locator_->has_lob_header_;
int64_t timeout = param.timeout_ - ObTimeUtility::current_time();
if (timeout < ObStorageRpcProxy::STREAM_RPC_TIMEOUT) {
timeout = ObStorageRpcProxy::STREAM_RPC_TIMEOUT;
}
ret = svr_rpc_proxy->to(dst_addr).by(arg.tenant_id_)
.dst_cluster_id(GCONF.cluster_id)
.ratelimit(true).bg_flow(obrpc::ObRpcProxy::BACKGROUND_FLOW)
.timeout(ObStorageRpcProxy::STREAM_RPC_TIMEOUT)
.timeout(timeout)
.lob_query(arg, rpc_buffer, handle);
if (OB_FAIL(ret)) {
LOG_WARN("failed to do remote query", K(ret));