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

[CP] Fix ObBlockAlloc double free.

Browse Source
This commit is contained in:
obdev
2022-09-16 04:32:29 +00:00
committed by wangzelin.wzl
parent e3f31ef1ce
commit 46a5748aba
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/storage/blocksstable/ob_tmp_file_store.cpp
View File

@ -728,7 +728,7 @@ void ObTmpTenantFileStore::inc_ref()
ATOMIC_INC(&ref_cnt_); ATOMIC_INC(&ref_cnt_);
} }
void ObTmpTenantFileStore::dec_ref() int64_t ObTmpTenantFileStore::dec_ref()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t tmp_ref = ATOMIC_SAF(&ref_cnt_, 1); const int64_t tmp_ref = ATOMIC_SAF(&ref_cnt_, 1);
@ -736,10 +736,8 @@ void ObTmpTenantFileStore::dec_ref()
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(ERROR, "bug: ref_cnt < 0", K(ret), K(tmp_ref), K(lbt())); STORAGE_LOG(ERROR, "bug: ref_cnt < 0", K(ret), K(tmp_ref), K(lbt()));
ob_abort(); ob_abort();
} else if (0 == tmp_ref) {
this->~ObTmpTenantFileStore();
allocator_.free(this);
} }
return tmp_ref;
} }
int ObTmpTenantFileStore::init(const uint64_t tenant_id, const ObStorageFileHandle& file_handle) int ObTmpTenantFileStore::init(const uint64_t tenant_id, const ObStorageFileHandle& file_handle)
@ -1210,19 +1208,21 @@ ObTmpTenantFileStoreHandle::~ObTmpTenantFileStoreHandle()
{ {
reset(); reset();
} }
void ObTmpTenantFileStoreHandle::set_tenant_store(ObTmpTenantFileStore *tenant_store) void ObTmpTenantFileStoreHandle::set_tenant_store(
ObTmpTenantFileStore *tenant_store, common::ObConcurrentFIFOAllocator *allocator)
{ {
if (OB_NOT_NULL(tenant_store)) { if (OB_NOT_NULL(tenant_store)) {
reset(); reset();
tenant_store->inc_ref(); // ref for handle tenant_store->inc_ref();
tenant_store_ = tenant_store; tenant_store_ = tenant_store;
allocator_ = allocator;
} }
} }
ObTmpTenantFileStoreHandle &ObTmpTenantFileStoreHandle::operator=(const ObTmpTenantFileStoreHandle &other) ObTmpTenantFileStoreHandle &ObTmpTenantFileStoreHandle::operator=(const ObTmpTenantFileStoreHandle &other)
{ {
if (&other != this) { if (&other != this) {
set_tenant_store(other.tenant_store_); set_tenant_store(other.tenant_store_, other.allocator_);
} }
return *this; return *this;
} }
@ -1240,7 +1240,11 @@ bool ObTmpTenantFileStoreHandle::is_valid() const
void ObTmpTenantFileStoreHandle::reset() void ObTmpTenantFileStoreHandle::reset()
{ {
if (OB_NOT_NULL(tenant_store_)) { if (OB_NOT_NULL(tenant_store_)) {
tenant_store_->dec_ref(); // ref for handle int64_t tmp_ref = tenant_store_->dec_ref();
if (0 == tmp_ref) {
tenant_store_->~ObTmpTenantFileStore();
allocator_->free(tenant_store_);
}
tenant_store_ = NULL; tenant_store_ = NULL;
} }
} }
@ -1461,7 +1465,7 @@ int ObTmpFileStore::get_store(const uint64_t tenant_id, ObTmpTenantFileStoreHand
allocator_.free(store); allocator_.free(store);
store = NULL; store = NULL;
STORAGE_LOG(WARN, "fail to init ObTmpTenantFileStore", K(ret), K(tenant_id)); STORAGE_LOG(WARN, "fail to init ObTmpTenantFileStore", K(ret), K(tenant_id));
} else if (FALSE_IT(handle.set_tenant_store(store))) { } else if (FALSE_IT(handle.set_tenant_store(store, &allocator_))) {
} else if (OB_FAIL(tenant_file_stores_.set_refactored(tenant_id, handle))) { } else if (OB_FAIL(tenant_file_stores_.set_refactored(tenant_id, handle))) {
STORAGE_LOG(WARN, "fail to set tenant_file_stores_", K(ret), K(tenant_id)); STORAGE_LOG(WARN, "fail to set tenant_file_stores_", K(ret), K(tenant_id));
} }

5
src/storage/blocksstable/ob_tmp_file_store.h
View File

@ -276,7 +276,7 @@ public:
return tmp_block_manager_.get_block_size(); return tmp_block_manager_.get_block_size();
} }
void inc_ref(); void inc_ref();
void dec_ref(); int64_t dec_ref();
private: private:
int read_page(ObTmpMacroBlock* block, ObTmpBlockIOInfo& io_info, ObTmpFileIOHandle& handle); int read_page(ObTmpMacroBlock* block, ObTmpBlockIOInfo& io_info, ObTmpFileIOHandle& handle);
@ -310,7 +310,7 @@ public:
~ObTmpTenantFileStoreHandle(); ~ObTmpTenantFileStoreHandle();
ObTmpTenantFileStoreHandle(const ObTmpTenantFileStoreHandle &other); ObTmpTenantFileStoreHandle(const ObTmpTenantFileStoreHandle &other);
ObTmpTenantFileStoreHandle &operator=(const ObTmpTenantFileStoreHandle &other); ObTmpTenantFileStoreHandle &operator=(const ObTmpTenantFileStoreHandle &other);
void set_tenant_store(ObTmpTenantFileStore *store); void set_tenant_store(ObTmpTenantFileStore *store, common::ObConcurrentFIFOAllocator *allocator);
bool is_empty() const; bool is_empty() const;
bool is_valid() const; bool is_valid() const;
void reset(); void reset();
@ -321,6 +321,7 @@ public:
private: private:
ObTmpTenantFileStore *tenant_store_; ObTmpTenantFileStore *tenant_store_;
common::ObConcurrentFIFOAllocator *allocator_;
}; };
class ObTmpFileStore { class ObTmpFileStore {