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

Add reader type for copy finish task extra_info

Browse Source
This commit is contained in:
obdev 2024-10-10 08:31:59 +00:00 committed by ob-robot
parent f7732c8b54
commit 0daeed471e
7 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/high_availability/ob_ls_migration.cpp
View File

@ -202,7 +202,7 @@ int ObCopyTabletCtx::get_copy_tablet_status(ObCopyTabletStatus::STATUS &status)
return ret;
}
int ObCopyTabletCtx::get_copy_tablet_record_extra_info(const ObCopyTabletRecordExtraInfo *&extra_info) const
int ObCopyTabletCtx::get_copy_tablet_record_extra_info(ObCopyTabletRecordExtraInfo *&extra_info)
{
int ret = OB_SUCCESS;
if (!is_valid()) {

2
src/storage/high_availability/ob_ls_migration.h
View File

@ -89,7 +89,7 @@ public:
void reset();
int set_copy_tablet_status(const ObCopyTabletStatus::STATUS &status) override;
int get_copy_tablet_status(ObCopyTabletStatus::STATUS &status) const override;
int get_copy_tablet_record_extra_info(const ObCopyTabletRecordExtraInfo *&extra_info) const override;
int get_copy_tablet_record_extra_info(ObCopyTabletRecordExtraInfo *&extra_info) override;
VIRTUAL_TO_STRING_KV(K_(tablet_id), K_(status));
public:

48
src/storage/high_availability/ob_physical_copy_ctx.cpp
View File

@ -18,6 +18,54 @@ namespace oceanbase
namespace storage
{
/******************ObCopyTabletRecordExtraInfo*********************/
ObCopyTabletRecordExtraInfo::ObCopyTabletRecordExtraInfo()
: cost_time_ms_(0),
total_data_size_(0),
write_data_size_(0),
major_count_(0),
macro_count_(0),
major_macro_count_(0),
reuse_macro_count_(0),
max_reuse_mgr_size_(0),
restore_action_(ObTabletRestoreAction::ACTION::RESTORE_NONE)
{
}
ObCopyTabletRecordExtraInfo::~ObCopyTabletRecordExtraInfo()
{
}
void ObCopyTabletRecordExtraInfo::reset()
{
cost_time_ms_ = 0;
total_data_size_ = 0;
write_data_size_ = 0;
major_count_ = 0;
macro_count_ = 0;
major_macro_count_ = 0;
reuse_macro_count_ = 0;
max_reuse_mgr_size_ = 0;
restore_action_ = ObTabletRestoreAction::ACTION::RESTORE_NONE;
}
int ObCopyTabletRecordExtraInfo::update_max_reuse_mgr_size(ObMacroBlockReuseMgr *reuse_mgr)
{
int ret = OB_SUCCESS;
int64_t count = 0;
if (OB_ISNULL(reuse_mgr)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("update max reuse mgr size get invalid argument", K(ret), KP(reuse_mgr));
} else if (OB_FAIL(reuse_mgr->count(count))) {
LOG_WARN("failed to count reuse mgr", K(ret), KP(reuse_mgr));
} else {
max_reuse_mgr_size_ = MAX(count * reuse_mgr->get_item_size(), max_reuse_mgr_size_);
}
return ret;
}
/******************ObPhysicalCopyCtx*********************/
ObPhysicalCopyCtx::ObPhysicalCopyCtx()
: lock_(),

15
src/storage/high_availability/ob_physical_copy_ctx.h
View File

@ -39,7 +39,7 @@ struct ObICopyTabletCtx
public:
virtual int set_copy_tablet_status(const ObCopyTabletStatus::STATUS &status) = 0;
virtual int get_copy_tablet_status(ObCopyTabletStatus::STATUS &status) const = 0;
virtual int get_copy_tablet_record_extra_info(const ObCopyTabletRecordExtraInfo *&extra_info) const = 0;
virtual int get_copy_tablet_record_extra_info(ObCopyTabletRecordExtraInfo *&extra_info) = 0;
};
class ObCopyTabletRecordExtraInfo final
@ -56,13 +56,14 @@ public:
OB_INLINE void add_macro_count(const int64_t &macro_count) { ATOMIC_FAA(&macro_count_, macro_count); }
OB_INLINE void add_major_macro_count(const int64_t &major_macro_count) { ATOMIC_FAA(&major_macro_count_, major_macro_count); }
OB_INLINE void add_reuse_macro_count(const int64_t &reuse_macro_count) { ATOMIC_FAA(&reuse_macro_count_, reuse_macro_count); }
OB_INLINE void set_restore_action(const ObTabletRestoreAction::ACTION &action) { ATOMIC_SET(&restore_action_, action); }
OB_INLINE int get_major_count() const { return ATOMIC_LOAD(&major_count_); }
// not atomic, but only called when major sstable copy finish, which is sequential
int update_max_reuse_mgr_size(
ObMacroBlockReuseMgr *&reuse_mgr);
int update_max_reuse_mgr_size(ObMacroBlockReuseMgr *reuse_mgr);
TO_STRING_KV(K_(cost_time_ms), K_(total_data_size), K_(write_data_size), K_(major_count), K_(macro_count),
K_(major_macro_count), K_(reuse_macro_count), K_(max_reuse_mgr_size));
TO_STRING_KV(K_(cost_time_ms), K_(total_data_size), K_(write_data_size), K_(major_count),
K_(macro_count), K_(major_macro_count), K_(reuse_macro_count), K_(max_reuse_mgr_size),
"restore_action", ObTabletRestoreAction::get_action_str(restore_action_));
private:
// The following 3 member variables are updated when writer of physical copy task finish
// time cost of tablet copy (fully migration / restore of a single tablet)
@ -83,6 +84,10 @@ private:
int64_t reuse_macro_count_;
// max reuse mgr size
int64_t max_reuse_mgr_size_;
// The following 1 member variable are updated when tablet copy finish
// restore action (when migration, it is RESTORE_NONE)
ObTabletRestoreAction::ACTION restore_action_;
};
struct ObPhysicalCopyCtx final

49
src/storage/high_availability/ob_tablet_copy_finish_task.cpp
View File

@ -100,7 +100,7 @@ int ObTabletCopyFinishTask::process()
int ret = OB_SUCCESS;
bool only_contain_major = false;
ObCopyTabletStatus::STATUS status = ObCopyTabletStatus::MAX_STATUS;
const ObCopyTabletRecordExtraInfo *extra_info = nullptr;
ObCopyTabletRecordExtraInfo *extra_info = nullptr;
if (!is_inited_) {
ret = OB_NOT_INIT;
@ -144,6 +144,7 @@ int ObTabletCopyFinishTask::process()
LOG_WARN("failed to get copy tablet record extra info", K(tmp_ret), KP(extra_info));
} else if (OB_ISNULL(extra_info)) {
LOG_WARN("copy tablet record extra info is NULL", K(extra_info));
} else if (FALSE_IT(extra_info->set_restore_action(restore_action_))) {
} else if (OB_SUCCESS != (tmp_ret = common::databuff_printf(extra_info_str, MAX_ROOTSERVICE_EVENT_EXTRA_INFO_LENGTH, "%s", to_cstring(*extra_info)))) {
LOG_WARN("failed to print extra info", K(tmp_ret), K(extra_info));
}
@ -639,51 +640,5 @@ int ObTabletCopyFinishTask::check_log_replay_to_mds_sstable_end_scn_()
return ret;
}
/******************ObCopyTabletRecordExtraInfo*********************/
ObCopyTabletRecordExtraInfo::ObCopyTabletRecordExtraInfo()
: cost_time_ms_(0),
total_data_size_(0),
write_data_size_(0),
major_count_(0),
macro_count_(0),
major_macro_count_(0),
reuse_macro_count_(0),
max_reuse_mgr_size_(0)
{
}
ObCopyTabletRecordExtraInfo::~ObCopyTabletRecordExtraInfo()
{
}
void ObCopyTabletRecordExtraInfo::reset()
{
cost_time_ms_ = 0;
total_data_size_ = 0;
write_data_size_ = 0;
major_count_ = 0;
macro_count_ = 0;
major_macro_count_ = 0;
reuse_macro_count_ = 0;
max_reuse_mgr_size_ = 0;
}
int ObCopyTabletRecordExtraInfo::update_max_reuse_mgr_size(ObMacroBlockReuseMgr *&reuse_mgr)
{
int ret = OB_SUCCESS;
int64_t count = 0;
if (OB_ISNULL(reuse_mgr)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("update max reuse mgr size get invalid argument", K(ret), KP(reuse_mgr));
} else if (OB_FAIL(reuse_mgr->count(count))) {
LOG_WARN("failed to count reuse mgr", K(ret), KP(reuse_mgr));
} else {
max_reuse_mgr_size_ = MAX(count * reuse_mgr->get_item_size(), max_reuse_mgr_size_);
}
return ret;
}
}
}

2
src/storage/high_availability/ob_tablet_group_restore.cpp
View File

@ -213,7 +213,7 @@ int ObTabletRestoreCtx::get_copy_tablet_status(ObCopyTabletStatus::STATUS &statu
return ret;
}
int ObTabletRestoreCtx::get_copy_tablet_record_extra_info(const ObCopyTabletRecordExtraInfo *&extra_info) const
int ObTabletRestoreCtx::get_copy_tablet_record_extra_info(ObCopyTabletRecordExtraInfo *&extra_info)
{
int ret = OB_SUCCESS;
if (!is_valid()) {

2
src/storage/high_availability/ob_tablet_group_restore.h
View File

@ -88,7 +88,7 @@ public:
void reset();
int set_copy_tablet_status(const ObCopyTabletStatus::STATUS &status) override;
int get_copy_tablet_status(ObCopyTabletStatus::STATUS &status) const override;
int get_copy_tablet_record_extra_info(const ObCopyTabletRecordExtraInfo *&extra_info) const override;
int get_copy_tablet_record_extra_info(ObCopyTabletRecordExtraInfo *&extra_info) override;
VIRTUAL_TO_STRING_KV(K_(tenant_id), K_(ls_id), K_(tablet_id), KPC_(restore_base_info), K_(is_leader),
K_(action), KP_(meta_index_store), KP_(second_meta_index_store), K_(replica_type), KP_(ha_table_info_mgr), K_(status));