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

[CP] [OBKV] fix ttl command report -4016 when observer restart

Browse Source
This commit is contained in:
shenyunlong.syl
2024-04-02 10:27:38 +00:00
committed by ob-robot
parent 96962b0ab8
commit 2689c7bb67
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/observer/table/ttl/ob_ttl_service.cpp
View File

@ -95,8 +95,8 @@ int ObTTLService::launch_ttl_task(const obrpc::ObTTLRequestArg &req)
LOG_WARN("fail to check_inner_stat", KR(ret));
} else {
if (OB_ISNULL(tenant_ttl_mgr_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tenant_ttl_mgr is null", KR(ret), K_(tenant_id), KP_(tenant_ttl_mgr));
ret = OB_EAGAIN;
LOG_WARN("tenant_ttl_mgr is null, need retry", KR(ret), K_(tenant_id), KP_(tenant_ttl_mgr));
} else if (OB_FAIL(tenant_ttl_mgr_->handle_user_ttl(req))) {
LOG_WARN("fail to handle user ttl", KR(ret), K_(tenant_id));
}

7
src/share/table/ob_ttl_util.cpp
View File

@ -1068,8 +1068,11 @@ int ObTTLUtil::dispatch_one_tenant_ttl(obrpc::ObTTLRequestArg::TTLRequestType ty
.dst_cluster_id(GCONF.cluster_id)
.dispatch_ttl(req, resp))) {
LOG_WARN("tenant ttl rpc failed", KR(ret), K(tenant_id), K(leader), K(ttl_info));
} else if (FALSE_IT(ret = resp.err_code_)) {
} else if (OB_FAIL(ret)) {
} else {
ret = resp.err_code_;
}
if (OB_FAIL(ret)) {
if (OB_LEADER_NOT_EXIST == ret || OB_EAGAIN == ret) {
const int64_t RESERVED_TIME_US = 600 * 1000; // 600 ms
const int64_t timeout_remain_us = THIS_WORKER.get_timeout_remain();