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

Add user_info_lock in mysql_connection_pool to protect user info

Browse Source
This commit is contained in:
taoshuning
2023-10-18 04:09:52 +00:00
committed by ob-robot
parent 663ac63e93
commit 248d19c046
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.cpp vendored
View File

@ -91,6 +91,7 @@ ObMySQLConnectionPool::ObMySQLConnectionPool()
tg_id_(-1), tg_id_(-1),
server_provider_(NULL), server_provider_(NULL),
busy_conn_count_(0), busy_conn_count_(0),
user_info_lock_(obsys::WRITE_PRIORITY),
config_(), config_(),
get_lock_(obsys::WRITE_PRIORITY), get_lock_(obsys::WRITE_PRIORITY),
dblink_pool_lock_(obsys::WRITE_PRIORITY), dblink_pool_lock_(obsys::WRITE_PRIORITY),
@ -154,6 +155,7 @@ int ObMySQLConnectionPool::set_db_param(const char *db_user, const char *db_pass
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int64_t w_len = 0; int64_t w_len = 0;
obsys::ObWLockGuard lock(user_info_lock_);
if (OB_ISNULL(db_user) || OB_ISNULL(db_pass) || OB_ISNULL(db_name)) { if (OB_ISNULL(db_user) || OB_ISNULL(db_pass) || OB_ISNULL(db_name)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid db param", KP(db_user), KP(db_pass), KP(db_name), K(ret)); LOG_WARN("invalid db param", KP(db_user), KP(db_pass), KP(db_name), K(ret));
@ -186,6 +188,7 @@ int ObMySQLConnectionPool::set_db_param(const ObString &db_user, const ObString
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("db param buffer is not enough", K(db_user), K(db_pass), K(db_name), K(ret)); LOG_WARN("db param buffer is not enough", K(db_user), K(db_pass), K(db_name), K(ret));
} else { } else {
obsys::ObWLockGuard lock(user_info_lock_);
MEMCPY(db_user_, db_user.ptr(), db_user.length()); MEMCPY(db_user_, db_user.ptr(), db_user.length());
db_user_[db_user.length()] = '\0'; db_user_[db_user.length()] = '\0';
MEMCPY(db_pass_, db_pass.ptr(), db_pass.length()); MEMCPY(db_pass_, db_pass.ptr(), db_pass.length());
@ -509,12 +512,23 @@ int ObMySQLConnectionPool::do_acquire(const uint64_t tenant_id, ObMySQLConnectio
int ObMySQLConnectionPool::try_connect(ObMySQLConnection *connection) int ObMySQLConnectionPool::try_connect(ObMySQLConnection *connection)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
char db_user[OB_MAX_USER_NAME_BUF_LENGTH] = {0};
char db_pass[OB_MAX_PASSWORD_BUF_LENGTH] = {0};
char db_name[OB_MAX_DATABASE_NAME_BUF_LENGTH] = {0};
// copy db_user infos within lock
{
obsys::ObRLockGuard lock(user_info_lock_);
MEMCPY(db_user, db_user_, OB_MAX_USER_NAME_BUF_LENGTH);
MEMCPY(db_pass, db_pass_, OB_MAX_PASSWORD_BUF_LENGTH);
MEMCPY(db_name, db_name_, OB_MAX_DATABASE_NAME_BUF_LENGTH);
}
if (OB_ISNULL(connection)) { if (OB_ISNULL(connection)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("connection must not null", K(ret)); LOG_WARN("connection must not null", K(ret));
} else if (connection->is_closed()) { } else if (connection->is_closed()) {
connection->set_timeout(config_.sqlclient_wait_timeout_); connection->set_timeout(config_.sqlclient_wait_timeout_);
if (OB_FAIL(connection->connect(db_user_, db_pass_, db_name_, is_use_ssl_))) { if (OB_FAIL(connection->connect(db_user, db_pass, db_name, is_use_ssl_))) {
LOG_WARN("fail to connect to server", LOG_WARN("fail to connect to server",
K(connection->get_server()), K(ret)); K(connection->get_server()), K(ret));
} else if ('\0' != init_sql_[0]) { } else if ('\0' != init_sql_[0]) {

2
deps/oblib/src/lib/mysqlclient/ob_mysql_connection_pool.h vendored
View File

@ -227,6 +227,8 @@ protected:
ObMySQLServerProvider *server_provider_; ObMySQLServerProvider *server_provider_;
volatile int64_t busy_conn_count_; volatile int64_t busy_conn_count_;
// user name or password or db maybe modify, add user_info_lock_ to protect user info
mutable obsys::ObRWLock user_info_lock_;
char db_user_[OB_MAX_USER_NAME_BUF_LENGTH]; char db_user_[OB_MAX_USER_NAME_BUF_LENGTH];
char db_pass_[OB_MAX_PASSWORD_BUF_LENGTH]; char db_pass_[OB_MAX_PASSWORD_BUF_LENGTH];
char db_name_[OB_MAX_DATABASE_NAME_BUF_LENGTH]; char db_name_[OB_MAX_DATABASE_NAME_BUF_LENGTH];