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

Fix: handle set obj should be the last step

Browse Source
This commit is contained in:
obdev 2024-09-18 08:03:39 +00:00 committed by ob-robot
parent 7afc2dd129
commit dc66775a9f
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/meta_mem/ob_tablet_pointer_map.cpp
View File

@ -631,6 +631,7 @@ int ObTabletPointerMap::get_meta_obj_with_external_memory(
if (OB_FAIL(load_meta_obj(key, t_ptr, allocator, disk_addr, t))) {
STORAGE_LOG(WARN, "load obj from disk fail", K(ret), K(key), KPC(t_ptr), K(lbt()));
} else {
ObTenantMetaMemMgr *t3m = MTL(ObTenantMetaMemMgr*);
ObTabletPointerHandle tmp_ptr_hdl(*this);
common::ObBucketHashWLockGuard lock_guard(ResourceMap::bucket_lock_, hash_val);
// some other thread finish loading
@ -660,13 +661,12 @@ int ObTabletPointerMap::get_meta_obj_with_external_memory(
}
} else if (OB_FAIL(t->deserialize_post_work(allocator))) {
STORAGE_LOG(WARN, "fail to deserialize post work", K(ret), KP(t));
} else {
ObTenantMetaMemMgr *t3m = MTL(ObTenantMetaMemMgr*);
guard.set_obj(t, &allocator, t3m);
} else if (OB_FAIL(t3m->inc_external_tablet_cnt(t->get_tablet_id().id(), t->get_transfer_seq()))) {
// TODO FEIDU t->pointer_hdl_.reset(); (external tablet should not hold tablet_pointer)
if (OB_FAIL(t3m->inc_external_tablet_cnt(t->get_tablet_id().id(), t->get_transfer_seq()))) {
STORAGE_LOG(WARN, "fail to inc external tablet cnt", K(ret), KP(t), KPC(t));
}
// !CAUTION: t3m->inc_external_tablet_cnt must be the last step which can modify ret; or, we have to dec_external_tablet_cnt in the failure process
STORAGE_LOG(WARN, "fail to inc external tablet cnt", K(ret), KP(t), KPC(t));
} else {
guard.set_obj(t, &allocator, t3m);
}
} // write lock end
if ((OB_FAIL(ret) && OB_NOT_NULL(t)) || need_free_obj) {

11
src/storage/meta_mem/ob_tenant_meta_mem_mgr.cpp
View File

@ -1693,10 +1693,13 @@ int ObTenantMetaMemMgr::get_tablet_with_allocator(
} else if (OB_UNLIKELY(!handle.is_valid())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tablet is null", K(ret), K(key), K(handle));
} else {
handle.set_wash_priority(priority);
if (&allocator == handle.get_allocator()) {
handle.disallow_copy_and_assign();
}
// get_meta_obj success or not set handle is disallow_copy_and_assign
handle.set_wash_priority(priority);
if (&allocator == handle.get_allocator()) {
handle.disallow_copy_and_assign();
if (OB_NOT_NULL(handle.get_obj())) {
handle.get_obj()->set_allocator(handle.get_allocator());
}
}