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

[BUG.FIX] Fixed compare-and-swap (CAS) tablet with an I/O operator.

Browse Source
This commit is contained in:
Tyshawn
2023-12-19 15:13:57 +00:00
committed by ob-robot
parent 568a90ce70
commit 28a14b828b
16 changed files with 224 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unittest/storage/test_tablet_helper.h
View File

@ -158,8 +158,11 @@ inline int TestTabletHelper::create_tablet(
}
}
if (FAILEDx(t3m->compare_and_swap_tablet(key, tablet_handle, tablet_handle))) {
STORAGE_LOG(WARN, "failed to compare and swap tablet", K(ret), K(ls_id), K(tablet_id));
ObUpdateTabletPointerParam param;
if (FAILEDx(tablet_handle.get_obj()->get_updating_tablet_pointer_param(param))) {
STORAGE_LOG(WARN, "fail to get updating tablet pointer parameters", K(ret), K(tablet_handle));
} else if (OB_FAIL(t3m->compare_and_swap_tablet(key, tablet_handle, tablet_handle, param))) {
STORAGE_LOG(WARN, "failed to compare and swap tablet", K(ret), K(ls_id), K(tablet_id), K(param));
} else if (OB_FAIL(ls_tablet_svr->tablet_id_set_.set(tablet_id))){
STORAGE_LOG(WARN, "set tablet id failed", K(ret), K(tablet_id));
} else {
@ -207,9 +210,12 @@ inline int TestTabletHelper::remove_tablet(const ObLSHandle &ls_handle, const Ob
} else {
tablet_handle.get_obj()->mds_data_.tablet_status_.committed_kv_.get_ptr()->v_.user_data_.assign(buf, data_serialize_size);
ObMetaDiskAddr disk_addr;
ObUpdateTabletPointerParam param;
disk_addr.set_mem_addr(0, sizeof(ObTablet));
if(OB_FAIL(t3m->compare_and_swap_tablet(
ObTabletMapKey(ls_id, tablet_id), tablet_handle, tablet_handle))) {
if (OB_FAIL(tablet_handle.get_obj()->get_updating_tablet_pointer_param(param))) {
STORAGE_LOG(WARN, "fail to get updating tablet pointer parameters", K(ret), K(tablet_handle));
} else if(OB_FAIL(t3m->compare_and_swap_tablet(
ObTabletMapKey(ls_id, tablet_id), tablet_handle, tablet_handle, param))) {
STORAGE_LOG(WARN, "failed to compare and swap tablet", K(ret), K(ls_id), K(tablet_id), K(disk_addr));
}
}

17
unittest/storage/test_tablet_pointer_map.cpp
View File

@ -264,7 +264,11 @@ TEST_F(TestMetaPointerMap, test_meta_pointer_map)
old_tablet->is_inited_ = true;
old_tablet->table_store_addr_.addr_.set_none_addr(); // mock empty_shell to pass test
ret = tablet_map_.compare_and_swap_addr_and_object(key, phy_addr, handle, handle);
ObUpdateTabletPointerParam param;
ret = handle.get_obj()->get_updating_tablet_pointer_param(param);
ASSERT_EQ(common::OB_SUCCESS, ret);
param.tablet_addr_ = phy_addr;
ret = tablet_map_.compare_and_swap_addr_and_object(key, handle, handle, param);
ASSERT_EQ(common::OB_SUCCESS, ret);
ObTablet *tablet = new ObTablet();
@ -277,7 +281,10 @@ TEST_F(TestMetaPointerMap, test_meta_pointer_map)
tablet->is_inited_ = true;
tablet->table_store_addr_.addr_.set_none_addr(); // mock empty_shell to pass test
ret = tablet_map_.compare_and_swap_addr_and_object(key, phy_addr, handle, tablet_handle);
ret = handle.get_obj()->get_updating_tablet_pointer_param(param);
ASSERT_EQ(common::OB_SUCCESS, ret);
param.tablet_addr_ = phy_addr;
ret = tablet_map_.compare_and_swap_addr_and_object(key, handle, tablet_handle, param);
ASSERT_EQ(common::OB_SUCCESS, ret);
ASSERT_EQ(1, tablet_map_.map_.size());
@ -354,7 +361,11 @@ TEST_F(TestMetaPointerMap, test_erase_and_load_concurrency)
old_tablet->is_inited_ = true;
old_tablet->table_store_addr_.addr_.set_none_addr(); // mock empty_shell to pass test
ret = tablet_map_.compare_and_swap_addr_and_object(key, phy_addr, handle, handle);
ObUpdateTabletPointerParam param;
ret = handle.get_obj()->get_updating_tablet_pointer_param(param);
ASSERT_EQ(common::OB_SUCCESS, ret);
param.tablet_addr_ = phy_addr;
ret = tablet_map_.compare_and_swap_addr_and_object(key, handle, handle, param);
ASSERT_EQ(common::OB_SUCCESS, ret);
ObTabletPointerHandle ptr_hdl(tablet_map_);