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

bugfix: fix dead lock in extend_file_size_task process

Browse Source
This commit is contained in:
obdev
2022-06-12 12:39:03 +08:00
committed by wangzelin.wzl
parent dccc4431e0
commit 5456ef83df
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/blocksstable/ob_store_file.cpp
View File

@ -430,7 +430,8 @@ ObStoreFile::ObStoreFile()
cond_(), cond_(),
is_fs_support_punch_hole_(true), is_fs_support_punch_hole_(true),
block_file_fd_(OB_INVALID_FD), block_file_fd_(OB_INVALID_FD),
alloc_lock_() alloc_lock_(),
resize_file_lock_()
{ {
MEMSET(used_macro_cnt_, 0, sizeof(used_macro_cnt_)); MEMSET(used_macro_cnt_, 0, sizeof(used_macro_cnt_));
} }
@ -1180,7 +1181,7 @@ int ObStoreFile::mark_macro_blocks()
// should lock before using to protect free_block_cnt_ opt // should lock before using to protect free_block_cnt_ opt
int ObStoreFile::extend_file_size_task() int ObStoreFile::extend_file_size_task()
{ {
lib::ObMutexGuard guard(block_lock_); // lock block info update opt lib::ObMutexGuard guard(resize_file_lock_); // lock resize file opt
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_ISNULL(store_file_system_)) { if (OB_ISNULL(store_file_system_)) {
} else { } else {
@ -1204,6 +1205,7 @@ int ObStoreFile::extend_file_size_task()
if (OB_FAIL(wait_mark_sweep_finish())) { if (OB_FAIL(wait_mark_sweep_finish())) {
LOG_WARN("fail to wait mark and sweep finish", K(ret)); LOG_WARN("fail to wait mark and sweep finish", K(ret));
} else { } else {
lib::ObMutexGuard guard(block_lock_); // lock block info update opt
bool is_extend_size = false; bool is_extend_size = false;
int64_t total_block_cnt = store_file_system_->get_total_macro_block_count(); int64_t total_block_cnt = store_file_system_->get_total_macro_block_count();
int64_t free_block_cnt_to_extend = int64_t free_block_cnt_to_extend =
@ -1543,11 +1545,12 @@ int ObStoreFile::resize_file(
if (OB_ISNULL(store_file_system_)) { if (OB_ISNULL(store_file_system_)) {
LOG_DEBUG("Do resize file fail, store_file_system_ is null pointer"); LOG_DEBUG("Do resize file fail, store_file_system_ is null pointer");
} else { } else {
lib::ObMutexGuard guard(block_lock_); lib::ObMutexGuard guard(resize_file_lock_);
disable_mark_sweep(); disable_mark_sweep();
if (OB_FAIL(wait_mark_sweep_finish())) { if (OB_FAIL(wait_mark_sweep_finish())) {
LOG_WARN("fail to wait mark and sweep finish", K(ret)); LOG_WARN("fail to wait mark and sweep finish", K(ret));
} else { } else {
lib::ObMutexGuard guard(block_lock_);
if (OB_FAIL(store_file_system_->resize_file(new_data_file_size, new_data_file_disk_percentage))) { if (OB_FAIL(store_file_system_->resize_file(new_data_file_size, new_data_file_disk_percentage))) {
LOG_WARN("fail to resize file", K(ret)); LOG_WARN("fail to resize file", K(ret));
} else if (OB_FAIL(refresh_block_meta())) { } else if (OB_FAIL(refresh_block_meta())) {

1
src/storage/blocksstable/ob_store_file.h
View File

@ -445,6 +445,7 @@ private:
bool is_fs_support_punch_hole_; bool is_fs_support_punch_hole_;
int block_file_fd_; int block_file_fd_;
lib::ObMutex alloc_lock_; lib::ObMutex alloc_lock_;
lib::ObMutex resize_file_lock_;
}; };
OB_INLINE bool ObStoreFile::is_valid(const MacroBlockId macro_id) OB_INLINE bool ObStoreFile::is_valid(const MacroBlockId macro_id)