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

avoid client hang when connect with invalid username/tenantname

Browse Source
This commit is contained in:
raywill
2023-05-30 03:41:41 +00:00
committed by ob-robot
parent 5991a385e1
commit c207d69af6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/observer/mysql/obmp_connect.cpp
View File

@ -101,12 +101,8 @@ int ObMPConnect::deserialize()
if (hsr_.is_jdbc_client_mode()) { if (hsr_.is_jdbc_client_mode()) {
conn->is_jdbc_client_ = true; conn->is_jdbc_client_ = true;
} }
if (OB_FAIL(extract_user_tenant(hsr_.get_username()))) { db_name_ = hsr_.get_database();
LOG_WARN("parse user@tenant fail", K(ret), "str", hsr_.get_username()); LOG_DEBUG("database name", K(hsr_.get_database()));
} else {
db_name_ = hsr_.get_database();
LOG_DEBUG("database name", K(hsr_.get_database()));
}
} }
deser_ret_ = ret; // record deserialize ret code. deser_ret_ = ret; // record deserialize ret code.
@ -229,6 +225,8 @@ int ObMPConnect::process()
} else { } else {
if (OB_FAIL(conn->ret_)) { if (OB_FAIL(conn->ret_)) {
LOG_WARN("connection fail at obsm_handle process", K(conn->ret_)); LOG_WARN("connection fail at obsm_handle process", K(conn->ret_));
} else if (OB_FAIL(extract_user_tenant(hsr_.get_username()))) {
LOG_WARN("parse user@tenant fail", K(ret), "str", hsr_.get_username());
} else if ((SS_INIT == GCTX.status_ || SS_STARTING == GCTX.status_) } else if ((SS_INIT == GCTX.status_ || SS_STARTING == GCTX.status_)
&& !tenant_name_.empty() && !tenant_name_.empty()
&& 0 != tenant_name_.compare(OB_SYS_TENANT_NAME)) { && 0 != tenant_name_.compare(OB_SYS_TENANT_NAME)) {