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

[CP] [Fix] OBKV TTL response

Browse Source
This commit is contained in:
IHEII
2023-10-18 06:39:23 +00:00
committed by ob-robot
parent 554e0b0751
commit 8ff0f4f3e9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/ob_rpc_struct.cpp
View File

@ -9420,7 +9420,7 @@ int ObBroadcastConsensusVersionArg::assign(const ObBroadcastConsensusVersionArg
} }
return ret; return ret;
} }
OB_SERIALIZE_MEMBER(ObTTLResponseArg, tenant_id_, task_id_, server_addr_, task_status_); OB_SERIALIZE_MEMBER(ObTTLResponseArg, tenant_id_, task_id_, server_addr_, task_status_, err_code_);
ObTTLResponseArg::ObTTLResponseArg() ObTTLResponseArg::ObTTLResponseArg()
: tenant_id_(0), : tenant_id_(0),
task_id_(OB_INVALID_ID), task_id_(OB_INVALID_ID),

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

@ -274,6 +274,9 @@ int ObTTLUtil::update_ttl_task(uint64_t tenant_id,
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (OB_FAIL(proxy.write(gen_meta_tenant_id(tenant_id), sql.ptr(), affect_rows))) { } else if (OB_FAIL(proxy.write(gen_meta_tenant_id(tenant_id), sql.ptr(), affect_rows))) {
LOG_WARN("fail to execute sql", K(ret), K(sql)); LOG_WARN("fail to execute sql", K(ret), K(sql));
if (ret == OB_ERR_EXCLUSIVE_LOCK_CONFLICT) {
FLOG_INFO("fail to execute sql, this task/rowkey is locked by other thread, pls try again", K(ret), K(sql));
}
} else if (affect_rows != 1) { } else if (affect_rows != 1) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_INFO("execute sql, affect rows != 1", K(ret), K(sql)); LOG_INFO("execute sql, affect rows != 1", K(ret), K(sql));