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

Add defensive for log restore mysql provider access concurrency control

Browse Source
This commit is contained in:
taoshuning
2023-07-26 13:12:22 +00:00
committed by ob-robot
parent ab84e575b0
commit 8bd1248740
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/share/ob_log_restore_proxy.cpp
View File

@ -65,11 +65,11 @@ namespace share
} while (OB_FAIL(ret) && retry_time++ < server_prover_.get_server_count() - 1);
ObLogRestoreMySQLProvider::ObLogRestoreMySQLProvider() : server_list_() {}
ObLogRestoreMySQLProvider::ObLogRestoreMySQLProvider() : server_list_(), lock_() {}
ObLogRestoreMySQLProvider::~ObLogRestoreMySQLProvider()
{
server_list_.reset();
destroy();
}
int ObLogRestoreMySQLProvider::init(const common::ObIArray<common::ObAddr> &server_list)
@ -80,6 +80,7 @@ int ObLogRestoreMySQLProvider::init(const common::ObIArray<common::ObAddr> &serv
int ObLogRestoreMySQLProvider::set_restore_source_server(const common::ObIArray<common::ObAddr> &server_list)
{
int ret = OB_SUCCESS;
WLockGuard guard(lock_);
if (OB_UNLIKELY(server_list.count() <= 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(server_list));
@ -90,15 +91,20 @@ int ObLogRestoreMySQLProvider::set_restore_source_server(const common::ObIArray<
}
void ObLogRestoreMySQLProvider::destroy()
{
WLockGuard guard(lock_);
server_list_.reset();
}
int ObLogRestoreMySQLProvider::get_server(const int64_t svr_idx, common::ObAddr &server)
{
RLockGuard guard(lock_);
int ret = OB_SUCCESS;
if (OB_UNLIKELY(svr_idx < 0 || svr_idx >= server_list_.count())) {
if (OB_UNLIKELY(svr_idx < 0)) {
ret = OB_INVALID_INDEX;
LOG_WARN("get_server invalid index", K(svr_idx));
} else if (OB_UNLIKELY(svr_idx >= server_list_.count())) {
ret = OB_ENTRY_NOT_EXIST;
LOG_WARN("svr_idx out of range", K(svr_idx), K(server_list_));
} else {
server = server_list_.at(svr_idx);
}
@ -107,6 +113,7 @@ int ObLogRestoreMySQLProvider::get_server(const int64_t svr_idx, common::ObAddr
int64_t ObLogRestoreMySQLProvider::get_server_count() const
{
RLockGuard guard(lock_);
return server_list_.count();
}

6
src/share/ob_log_restore_proxy.h
View File

@ -49,8 +49,14 @@ public:
int prepare_refresh() override;
int end_refresh() override;
private:
typedef common::SpinRWLock RWLock;
typedef common::SpinRLockGuard RLockGuard;
typedef common::SpinWLockGuard WLockGuard;
private:
common::ObArray<common::ObAddr> server_list_;
mutable RWLock lock_;
private:
DISALLOW_COPY_AND_ASSIGN(ObLogRestoreMySQLProvider);