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

fix reuse and recycle dblink connection bug

Browse Source
This commit is contained in:
sdc
2023-06-06 04:42:38 +00:00
committed by ob-robot
parent ea8a31197f
commit e6ae3402f6
11 changed files with 100 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
deps/oblib/src/lib/mysqlclient/ob_mysql_proxy.cpp vendored
View File

@ -446,7 +446,7 @@ int ObDbLinkProxy::create_dblink_pool(uint64_t tenant_id, uint64_t dblink_id, Db
return ret;
}
int ObDbLinkProxy::acquire_dblink(uint64_t dblink_id,
int ObDbLinkProxy::acquire_dblink(uint64 tenant_id, uint64_t dblink_id,
DblinkDriverProto dblink_type,
const dblink_param_ctx &param_ctx,
ObISQLConnection *&dblink_conn,
@ -461,7 +461,8 @@ int ObDbLinkProxy::acquire_dblink(uint64_t dblink_id,
LOG_WARN("dblink proxy not inited");
} else if (OB_FAIL(switch_dblink_conn_pool(dblink_type, dblink_pool))) {
LOG_WARN("failed to get dblink interface", K(ret), K(dblink_type));
} else if (OB_FAIL(dblink_pool->acquire_dblink(dblink_id, param_ctx, dblink_conn, sessid, sql_request_level))) {
} else if (OB_FAIL(dblink_pool->acquire_dblink(tenant_id, dblink_id, param_ctx, dblink_conn,
sessid, sql_request_level))) {
LOG_WARN("acquire dblink failed", K(ret), K(dblink_id), K(dblink_type));
} else if (OB_FAIL(prepare_enviroment(dblink_conn, dblink_type, set_sql_mode_cstr))) {
LOG_WARN("failed to prepare dblink env", K(ret));
@ -596,3 +597,18 @@ int ObDbLinkProxy::rollback(ObISQLConnection *dblink_conn)
}
return ret;
}
int ObDbLinkProxy::clean_dblink_connection(uint64_t tenant_id)
{
int ret = OB_SUCCESS;
if (OB_ISNULL(link_pool_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to switch dblink conn pool", K(ret));
} else {
if (OB_FAIL(link_pool_->get_mysql_pool().clean_dblink_connection(tenant_id))) {
LOG_WARN("clean mysql pool failed", K(ret));
}
}
return ret;
}