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

[BUG.FIX] fix -4016 issue when loading tablet

Browse Source
This commit is contained in:
Tyshawn
2023-10-18 03:13:55 +00:00
committed by ob-robot
parent 9688e0d157
commit eb7a594855
13 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mittest/mtlenv/test_tx_data_table.cpp
View File

@ -351,7 +351,7 @@ void TestTxDataTable::init_memtable_mgr_(ObTxDataMemtableMgr *memtable_mgr)
{
ASSERT_NE(nullptr, memtable_mgr);
memtable_mgr->set_freezer(&tx_data_table_.freezer_);
ASSERT_EQ(OB_SUCCESS, memtable_mgr->create_memtable(SCN::min_scn(), 1));
ASSERT_EQ(OB_SUCCESS, memtable_mgr->create_memtable(SCN::min_scn(), 1, SCN::min_scn()));
ASSERT_EQ(1, memtable_mgr->get_memtable_count_());
}
@ -634,7 +634,7 @@ void TestTxDataTable::do_repeat_insert_test() {
ObTxDataMemtableMgr *memtable_mgr = tx_data_table_.get_memtable_mgr_();
ASSERT_NE(nullptr, memtable_mgr);
memtable_mgr->set_freezer(&tx_data_table_.freezer_);
ASSERT_EQ(OB_SUCCESS, memtable_mgr->create_memtable(SCN::min_scn(), 1));
ASSERT_EQ(OB_SUCCESS, memtable_mgr->create_memtable(SCN::min_scn(), 1, SCN::min_scn()));
ASSERT_EQ(1, memtable_mgr->get_memtable_count_());
insert_start_scn.convert_for_logservice(ObTimeUtil::current_time_ns());

22
src/storage/meta_mem/ob_meta_pointer_map.h
View File

@ -518,12 +518,11 @@ int ObMetaPointerMap<Key, T>::load_meta_obj(
common::ObBucketHashRLockGuard lock_guard(ResourceMap::bucket_lock_, hash_val);
if (OB_FAIL(meta_pointer->read_from_disk(arena_allocator, buf, buf_len, load_addr))) {
STORAGE_LOG(WARN, "fail to read from disk", K(ret), KPC(meta_pointer));
}
}
if (OB_SUCC(ret)) {
t->tablet_addr_ = load_addr;
if (OB_FAIL(meta_pointer->deserialize(allocator, buf, buf_len, t))) {
STORAGE_LOG(WARN, "fail to deserialize object", K(ret), K(key), KPC(meta_pointer));
} else {
t->tablet_addr_ = load_addr;
if (OB_FAIL(meta_pointer->deserialize(allocator, buf, buf_len, t))) {
STORAGE_LOG(WARN, "fail to deserialize object", K(ret), K(key), KPC(meta_pointer));
}
}
}
}
@ -557,12 +556,11 @@ int ObMetaPointerMap<Key, T>::load_meta_obj(
common::ObBucketHashRLockGuard lock_guard(ResourceMap::bucket_lock_, hash_val);
if (OB_FAIL(meta_pointer->read_from_disk(arena_allocator, buf, buf_len, load_addr))) {
STORAGE_LOG(WARN, "fail to read from disk", K(ret), KPC(meta_pointer));
}
}
if (OB_SUCC(ret)) {
t->tablet_addr_ = load_addr;
if (OB_FAIL(meta_pointer->deserialize(buf, buf_len, t))) {
STORAGE_LOG(WARN, "fail to deserialize object", K(ret), K(key), KPC(meta_pointer));
} else {
t->tablet_addr_ = load_addr;
if (OB_FAIL(meta_pointer->deserialize(buf, buf_len, t))) {
STORAGE_LOG(WARN, "fail to deserialize object", K(ret), K(key), KPC(meta_pointer));
}
}
}
}

2
src/storage/ob_i_memtable_mgr.h
View File

@ -221,10 +221,12 @@ public:
virtual int create_memtable(const share::SCN clog_checkpoint_scn,
const int64_t schema_version,
const share::SCN newest_clog_checkpoint_scn,
const bool for_replay = false)
{
UNUSED(clog_checkpoint_scn);
UNUSED(schema_version);
UNUSED(newest_clog_checkpoint_scn);
UNUSED(for_replay);
return OB_NOT_SUPPORTED;
}

2
src/storage/tablelock/ob_lock_memtable_mgr.cpp
View File

@ -82,10 +82,12 @@ void ObLockMemtableMgr::reset()
int ObLockMemtableMgr::create_memtable(const SCN clog_checkpoint_scn,
const int64_t schema_version,
const SCN newest_clog_checkpoint_scn,
const bool for_replay)
{
UNUSED(clog_checkpoint_scn);
UNUSED(schema_version);
UNUSED(newest_clog_checkpoint_scn);
UNUSED(for_replay);
int ret = OB_SUCCESS;

1
src/storage/tablelock/ob_lock_memtable_mgr.h
View File

@ -63,6 +63,7 @@ public:
virtual int create_memtable(const share::SCN clog_checkpoint_scn,
const int64_t schema_version,
const share::SCN newest_clog_checkpoint_scn,
const bool for_replay = false) override;
DECLARE_VIRTUAL_TO_STRING;

2
src/storage/tablet/ob_tablet.cpp
View File

@ -3474,7 +3474,7 @@ int ObTablet::inner_create_memtable(
}
} else if (OB_FAIL(get_memtable_mgr(memtable_mgr))) {
LOG_WARN("failed to get memtable mgr", K(ret));
} else if (OB_FAIL(memtable_mgr->create_memtable(clog_checkpoint_scn, schema_version, for_replay))) {
} else if (OB_FAIL(memtable_mgr->create_memtable(clog_checkpoint_scn, schema_version, tablet_meta_.clog_checkpoint_scn_, for_replay))) {
if (OB_ENTRY_EXIST != ret && OB_MINOR_FREEZE_NOT_ALLOW != ret) {
LOG_WARN("failed to create memtable for tablet", K(ret), K(ls_id), K(tablet_id),
K(clog_checkpoint_scn), K(schema_version), K(for_replay));

4
src/storage/tablet/ob_tablet_memtable_mgr.cpp
View File

@ -164,6 +164,7 @@ int ObTabletMemtableMgr::reset_storage_recorder()
// 2. create the new memtable after freezing the old memtable
int ObTabletMemtableMgr::create_memtable(const SCN clog_checkpoint_scn,
const int64_t schema_version,
const SCN new_clog_checkpoint_scn,
const bool for_replay)
{
ObTimeGuard time_guard("ObTabletMemtableMgr::create_memtable", 10 * 1000);
@ -178,7 +179,6 @@ int ObTabletMemtableMgr::create_memtable(const SCN clog_checkpoint_scn,
memtable::ObMemtable *active_memtable = nullptr;
uint32_t memtable_freeze_clock = UINT32_MAX;
share::ObLSID ls_id;
SCN new_clog_checkpoint_scn;
int64_t memtable_count = get_memtable_count_();
if (has_memtable && OB_NOT_NULL(active_memtable = get_active_memtable_())) {
memtable_freeze_clock = active_memtable->get_freeze_clock();
@ -204,8 +204,6 @@ int ObTabletMemtableMgr::create_memtable(const SCN clog_checkpoint_scn,
K(get_memtable_count_()),
KPC(first_frozen_memtable.get_table()));
}
} else if (OB_FAIL(get_newest_clog_checkpoint_scn(new_clog_checkpoint_scn))) {
LOG_WARN("failed to get newest clog_checkpoint_scn", K(ret), K(ls_id), K(tablet_id_), K(new_clog_checkpoint_scn));
} else if (for_replay && clog_checkpoint_scn != new_clog_checkpoint_scn) {
ret = OB_EAGAIN;
LOG_INFO("clog_checkpoint_scn changed, need retry to replay", K(ls_id), K(tablet_id_), K(clog_checkpoint_scn), K(new_clog_checkpoint_scn));

8
src/storage/tablet/ob_tablet_memtable_mgr.h
View File

@ -65,9 +65,11 @@ public:
int get_last_frozen_memtable(ObTableHandleV2 &handle) const;
virtual int get_boundary_memtable(ObTableHandleV2 &handle) override;
int release_tail_memtable(memtable::ObIMemtable *memtable);
int create_memtable(const share::SCN clog_checkpoint_scn,
const int64_t schema_version,
const bool for_replay);
virtual int create_memtable(
const share::SCN clog_checkpoint_scn,
const int64_t schema_version,
const share::SCN newest_clog_checkpoint_scn,
const bool for_replay) override;
int get_memtables(
ObTableHdlArray &handle,
const bool reset_handle = true,

2
src/storage/tx_table/ob_tx_ctx_memtable_mgr.cpp
View File

@ -60,10 +60,12 @@ void ObTxCtxMemtableMgr::reset()
int ObTxCtxMemtableMgr::create_memtable(const SCN last_replay_scn,
const int64_t schema_version,
const SCN newest_clog_checkpoint_scn,
const bool for_replay)
{
UNUSED(last_replay_scn);
UNUSED(schema_version);
UNUSED(newest_clog_checkpoint_scn);
UNUSED(for_replay);
int ret = OB_SUCCESS;

1
src/storage/tx_table/ob_tx_ctx_memtable_mgr.h
View File

@ -59,6 +59,7 @@ public:
// create_memtable is used for creating the only memtable for CheckpointMgr
virtual int create_memtable(const share::SCN last_replay_scn,
const int64_t schema_version,
const share::SCN newest_clog_checkpoint_scn,
const bool for_replay=false) override;
const ObTxCtxMemtable *get_tx_ctx_memtable_(const int64_t pos) const;

2
src/storage/tx_table/ob_tx_data_memtable_mgr.cpp
View File

@ -132,8 +132,10 @@ int ObTxDataMemtableMgr::release_head_memtable_(memtable::ObIMemtable *imemtable
int ObTxDataMemtableMgr::create_memtable(const SCN clog_checkpoint_scn,
const int64_t schema_version,
const SCN newest_clog_checkpoint_scn,
const bool for_replay)
{
UNUSED(newest_clog_checkpoint_scn);
UNUSED(for_replay);
int ret = OB_SUCCESS;
if (IS_NOT_INIT) {

1
src/storage/tx_table/ob_tx_data_memtable_mgr.h
View File

@ -120,6 +120,7 @@ public: // ObTxDataMemtableMgr
*/
virtual int create_memtable(const share::SCN clog_checkpoint_scn,
const int64_t schema_version,
const share::SCN newest_clog_checkpoint_scn,
const bool for_replay=false) override;
/**
* @brief Get the last tx data memtable in memtable list.

3
unittest/storage/tx_table/test_tx_ctx_table.cpp
View File

@ -175,7 +175,8 @@ TEST_F(TestTxCtxTable, test_tx_ctx_memtable_mgr)
{
EXPECT_EQ(0, TestTxCtxTable::ref_count_);
EXPECT_EQ(OB_SUCCESS, mt_mgr_->create_memtable(SCN::min_scn(), /*last_replay_log_ts*/
0 /*schema_version*/));
0 /*schema_version*/,
SCN::min_scn()));
EXPECT_EQ(1, TestTxCtxTable::ref_count_);