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

[MDS] empty shell tablet mds_table don't contribute rec_scn

Browse Source
This commit is contained in:
fengdeyiji
2023-08-29 12:40:32 +00:00
committed by ob-robot
parent 627114a16b
commit 78d58cb036
4 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/checkpoint/ob_common_checkpoint.h
View File

@ -92,6 +92,11 @@ public:
virtual int flush(share::SCN recycle_scn, bool need_freeze = true) = 0;
virtual ObTabletID get_tablet_id() const = 0;
virtual share::SCN get_rec_scn(ObTabletID &tablet_id) {
share::SCN rec_scn = get_rec_scn();
tablet_id = get_tablet_id();
return rec_scn;
}
virtual bool is_flushing() const = 0;
VIRTUAL_TO_STRING_KV(KP(this));

3
src/storage/ls/ob_ls_tx_service.cpp
View File

@ -554,8 +554,7 @@ int ObLSTxService::get_common_checkpoint_info(
TRANS_LOG(WARN, "the common_checkpoint should not be null", K(i));
} else {
ObCommonCheckpointVTInfo info;
info.tablet_id = common_checkpoint->get_tablet_id();
info.rec_scn = common_checkpoint->get_rec_scn();
info.rec_scn = common_checkpoint->get_rec_scn(info.tablet_id);
info.checkpoint_type = i;
info.is_flushing = common_checkpoint->is_flushing();
common_checkpoint_array.push_back(info);

65
src/storage/multi_data_source/mds_table_mgr.cpp
View File

@ -9,7 +9,9 @@
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PubL v2 for more details.
*/
#include "lib/container/ob_se_array.h"
#include "lib/ob_errno.h"
#include "mds_ctx.h"
#include "ob_tablet_id.h"
#define USING_LOG_PREFIX MDS
@ -129,38 +131,30 @@ void ObMdsTableMgr::unregister_from_removed_mds_table_recorder(MdsTableBase *p_m
removed_mds_table_recorder_.del(p_mds_table);
}
int ObMdsTableMgr::first_scan_to_get_min_rec_scn_(share::SCN &min_rec_scn)
int ObMdsTableMgr::first_scan_to_get_min_rec_scn_(share::SCN &min_rec_scn, ObIArray<ObTabletID> &min_rec_scn_ids)
{
MDS_TG(10_s);
int ret = OB_SUCCESS;
int64_t scan_cnt = 0;
auto get_max_min_rec_scn_op =
[&min_rec_scn, &scan_cnt](const common::ObTabletID &tablet_id, List<MdsTableBase> &mds_table_list) {
int tmp_ret = OB_SUCCESS;
if (mds_table_list.empty()) {
MDS_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "meet empty mds table list", K(tablet_id));
} else {
MdsTableBase *mds_table = static_cast<MdsTableBase *>(mds_table_list.list_head_);
if (mds_table->is_removed_from_t3m() || mds_table->is_switched_to_empty_shell()) {
// jsut skip it
} else {
share::SCN rec_scn = mds_table->get_rec_scn();
min_rec_scn = std::min(rec_scn, min_rec_scn);
++scan_cnt;
}
}
// true means iterating the next mds table
return true;
};
auto get_min_rec_scn_op =
[&min_rec_scn, &scan_cnt](const common::ObTabletID &, MdsTableBase *&mds_table) {
share::SCN rec_scn = mds_table->get_rec_scn();
min_rec_scn = std::min(rec_scn, min_rec_scn);
++scan_cnt;
[&min_rec_scn, &scan_cnt, &min_rec_scn_ids](const common::ObTabletID &, MdsTableBase *&mds_table) {
if (!mds_table->is_switched_to_empty_shell()) {
share::SCN rec_scn = mds_table->get_rec_scn();
if (rec_scn == min_rec_scn) {
if (min_rec_scn_ids.count() < 128) {
(void) min_rec_scn_ids.push_back(mds_table->get_tablet_id());
}
} else if (rec_scn < min_rec_scn) {
min_rec_scn = rec_scn;
min_rec_scn_ids.reset();
(void) min_rec_scn_ids.push_back(mds_table->get_tablet_id());
}
++scan_cnt;
}
return true;// true means iterating the next mds table
};
if (OB_FAIL(mds_table_map_.for_each(get_min_rec_scn_op))) {
MDS_LOG(WARN, "fail to do map for_each", KR(ret), K(*this), K(scan_cnt), K(min_rec_scn));
MDS_LOG(WARN, "fail to do map for_each", KR(ret), K(*this), K(scan_cnt), K(min_rec_scn), K(min_rec_scn_ids));
}
return ret;
}
@ -173,7 +167,9 @@ int ObMdsTableMgr::second_scan_to_do_flush_(share::SCN do_flush_limit_scn)
auto flush_op = [do_flush_limit_scn, &scan_mds_table_cnt](const common::ObTabletID &tablet_id,
MdsTableBase *&mds_table) {
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(mds_table->flush(do_flush_limit_scn))) {
if (mds_table->is_switched_to_empty_shell()) {
MDS_LOG_RET(INFO, ret, "skip empty shell tablet mds_table flush", K(tablet_id), K(scan_mds_table_cnt));
} else if (OB_TMP_FAIL(mds_table->flush(do_flush_limit_scn))) {
MDS_LOG_RET(WARN, ret, "flush mds table failed", KR(tmp_ret), K(tablet_id), K(scan_mds_table_cnt));
} else {
++scan_mds_table_cnt;
@ -200,13 +196,14 @@ int ObMdsTableMgr::flush(SCN recycle_scn, bool need_freeze)
MdsTableHandle *flushing_mds_table = nullptr;
share::SCN min_rec_scn = share::SCN::max_scn();
share::SCN max_consequent_callbacked_scn;
ObSEArray<ObTabletID, 10> min_rec_scn_tablet_ids;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
MDS_LOG_FREEZE(ERROR, "mds table mgr not inited");
} else if (!freeze_guard.can_freeze()) {
MDS_LOG_FREEZE(INFO, "mds table mgr is doing flush, skip flush once");
} else if (MDS_FAIL(first_scan_to_get_min_rec_scn_(min_rec_scn))) {
} else if (MDS_FAIL(first_scan_to_get_min_rec_scn_(min_rec_scn, min_rec_scn_tablet_ids))) {
MDS_LOG_FREEZE(WARN, "do first_scan_to_get_min_rec_scn_ failed");
} else if (min_rec_scn == share::SCN::max_scn()) {// no mds table
MDS_LOG_FREEZE(INFO, "no valid mds table there, no need do flush");
@ -246,19 +243,29 @@ int ObMdsTableMgr::flush(SCN recycle_scn, bool need_freeze)
SCN ObMdsTableMgr::get_freezing_scn() const { return freezing_scn_.atomic_get(); }
SCN ObMdsTableMgr::get_rec_scn()
{
ObTabletID tablet_id;
return get_rec_scn(tablet_id);
}
share::SCN ObMdsTableMgr::get_rec_scn(ObTabletID &tablet_id)
{
MDS_TG(1_s);
int ret = OB_SUCCESS;
SCN min_rec_scn = share::SCN::max_scn();
ObSEArray<ObTabletID, 10> min_rec_scn_tablet_ids;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
MDS_LOG(ERROR, "regsiter mds table failed", KR(ret));
} else if (MDS_FAIL(first_scan_to_get_min_rec_scn_(min_rec_scn))) {
} else if (MDS_FAIL(first_scan_to_get_min_rec_scn_(min_rec_scn, min_rec_scn_tablet_ids))) {
min_rec_scn = SCN::min_scn();
MDS_LOG(WARN, "fail to scan get min_rec_scn", KR(ret), K(min_rec_scn), K(*this));
MDS_LOG(WARN, "fail to scan get min_rec_scn", KR(ret), K(min_rec_scn), K(min_rec_scn_tablet_ids), K(*this));
} else {
MDS_LOG(INFO, "get rec_scn from MdsTableMgr", KR(ret), K(min_rec_scn), K(*this));
if (!min_rec_scn_tablet_ids.empty()) {
tablet_id = min_rec_scn_tablet_ids.at(0);
}
MDS_LOG(INFO, "get rec_scn from MdsTableMgr", KR(ret), K(min_rec_scn), K(min_rec_scn_tablet_ids), K(*this));
}
return min_rec_scn;
}

4
src/storage/multi_data_source/mds_table_mgr.h
View File

@ -16,6 +16,7 @@
#include "lib/lock/ob_small_spin_lock.h"
#include "lib/lock/ob_tc_rwlock.h"
#include "meta_programming/ob_type_traits.h"
#include "ob_tablet_id.h"
#include "storage/checkpoint/ob_common_checkpoint.h"
#include "storage/multi_data_source/runtime_utility/list_helper.h"
#include "lib/hash/ob_linear_hash_map.h"
@ -96,6 +97,7 @@ public:
public: // derived from ObCommonCheckpoint
share::SCN get_freezing_scn() const;
virtual share::SCN get_rec_scn() override;
virtual share::SCN get_rec_scn(ObTabletID &tablet_id) override;
virtual int flush(share::SCN recycle_scn, bool need_freeze = true) override;
virtual ObTabletID get_tablet_id() const override { return ObTabletID(0); }
virtual bool is_flushing() const override { return false; }
@ -106,7 +108,7 @@ public: // getter and setter
int64_t get_ref() { return ATOMIC_LOAD(&ref_cnt_); }
private:
int first_scan_to_get_min_rec_scn_(share::SCN &min_rec_scn);
int first_scan_to_get_min_rec_scn_(share::SCN &min_rec_scn, ObIArray<ObTabletID> &min_rec_scn_ids);
int second_scan_to_do_flush_(share::SCN min_rec_scn);
private: