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

fix bug of reusing washed chunk

Browse Source
This commit is contained in:
obdev
2023-02-20 12:42:25 +00:00
committed by ob-robot
parent 51b73b3aed
commit d1125dee41
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deps/oblib/src/lib/alloc/block_set.cpp vendored
View File

@ -349,17 +349,16 @@ void BlockSet::free_chunk(AChunk *const chunk)
chunk->next_->prev_ = chunk->prev_; chunk->next_->prev_ = chunk->prev_;
chunk->prev_->next_ = chunk->next_; chunk->prev_->next_ = chunk->next_;
} }
uint64_t payload = 0;
const uint64_t all_size = AChunkMgr::aligned(chunk->alloc_bytes_); const uint64_t hold = chunk->hold(&payload);
bool freed = false; bool freed = false;
if (INTACT_ACHUNK_SIZE == all_size) { if (INTACT_ACHUNK_SIZE == hold) {
LockGuard lock(cache_shared_lock_); LockGuard lock(cache_shared_lock_);
freed = chunk_free_list_.push(chunk); freed = chunk_free_list_.push(chunk);
} }
if (!freed) { if (!freed) {
if (OB_NOT_NULL(tallocator_)) { if (OB_NOT_NULL(tallocator_)) {
uint64_t payload = 0; UNUSED(ATOMIC_FAA(&total_hold_, -hold));
UNUSED(ATOMIC_FAA(&total_hold_, -chunk->hold(&payload)));
UNUSED(ATOMIC_FAA(&total_payload_, -payload)); UNUSED(ATOMIC_FAA(&total_payload_, -payload));
if (chunk->washed_size_ != 0) { if (chunk->washed_size_ != 0) {
tallocator_->update_wash_stat(-1, -chunk->washed_blks_, -chunk->washed_size_); tallocator_->update_wash_stat(-1, -chunk->washed_blks_, -chunk->washed_size_);