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

[to #56420037] fix: reset ret explicitly before local retry in ps and ps-exec protocol

Browse Source
This commit is contained in:
haohao022 2024-04-26 14:16:31 +00:00 committed by ob-robot
parent 79d9ebaa91
commit fcb30bad2e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/observer/mysql/obmp_stmt_prepare.cpp
View File

@ -310,9 +310,12 @@ int ObMPStmtPrepare::process_prepare_stmt(const ObMultiStmtItem &multi_stmt_item
ctx_.is_prepare_stage_ = true;
need_response_error = false;
do {
// reset `ret` explicitly before local retry
ret = OB_SUCCESS;
share::schema::ObSchemaGetterGuard schema_guard;
retry_ctrl_.clear_state_before_each_retry(session.get_retry_info_for_update());
if (OB_FAIL(gctx_.schema_service_->get_tenant_schema_guard(
if (OB_FAIL(ret)) {
} else if (OB_FAIL(gctx_.schema_service_->get_tenant_schema_guard(
session.get_effective_tenant_id(), schema_guard))) {
LOG_WARN("get schema guard failed", K(ret));
} else if (OB_FAIL(schema_guard.get_schema_version(

5
src/observer/mysql/obmp_stmt_prexecute.cpp
View File

@ -199,13 +199,16 @@ int ObMPStmtPrexecute::before_process()
} else {
oceanbase::lib::Thread::WaitGuard guard(oceanbase::lib::Thread::WAIT_FOR_LOCAL_RETRY);
do {
// reset `ret` explicitly before local retry
ret = OB_SUCCESS;
SMART_VAR(ObMySQLResultSet, result, *session, THIS_WORKER.get_allocator()) {
result.set_has_more_result(false);
share::schema::ObSchemaGetterGuard schema_guard;
const uint64_t tenant_id = session->get_effective_tenant_id();
ObVirtualTableIteratorFactory vt_iter_factory(*gctx_.vt_iter_creator_);
retry_ctrl_.clear_state_before_each_retry(session->get_retry_info_for_update());
if (OB_FAIL(gctx_.schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(gctx_.schema_service_->get_tenant_schema_guard(tenant_id, schema_guard))) {
LOG_WARN("get schema guard failed", K(ret));
} else if (OB_FAIL(schema_guard.get_schema_version(
session->get_effective_tenant_id(), tenant_version))) {