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

patch backup piece to 3.1. open source

Browse Source
This commit is contained in:
xuhuleon
2021-09-02 15:26:39 +08:00
committed by wangzelin.wzl
parent 153f16ad8a
commit 62cb470338
314 changed files with 88279 additions and 35466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/storage/ob_partition_scheduler.cpp
View File

@ -1397,12 +1397,7 @@ int ObPartitionScheduler::schedule_partition_merge(const ObMergeType merge_type,
}
if (OB_SUCC(ret) && need_merge_table_ids.count() > 0) {
bool can_schedule = true;
if (OB_FAIL(can_schedule_partition(merge_type, can_schedule))) {
LOG_WARN("failed to check can schedule partition", K(ret), K(merge_type));
}
for (int64_t i = 0; OB_SUCC(ret) && i < need_merge_table_ids.count() && can_schedule; ++i) {
for (int64_t i = 0; OB_SUCC(ret) && i < need_merge_table_ids.count(); ++i) {
const uint64_t table_id = need_merge_table_ids[i];
if (OB_FAIL(check_need_merge_table(table_id, need_merge))) {
LOG_WARN("failed to check need merge table", K(ret), K(table_id), "pg_key", pg.get_partition_key());
@ -2479,34 +2474,6 @@ int ObPartitionScheduler::reload_minor_merge_schedule_interval()
return ret;
}
int ObPartitionScheduler::can_schedule_partition(const ObMergeType merge_type, bool& can_schedule)
{
int ret = OB_SUCCESS;
const float PAUSE_MERGE_DISK_RADIO = 0.95;
const int64_t PRINT_INTERVAL = 5 * 1000 * 1000; // 5s
bool is_backup_started = false;
can_schedule = true;
if (OB_UNLIKELY(!inited_)) {
ret = OB_NOT_INIT;
LOG_WARN("The ObPartitionScheduler has not been inited, ", K(ret));
} else if (ObMergeType::MAJOR_MERGE != merge_type) {
can_schedule = true;
} else if (OB_FAIL(ObBackupInfoMgr::get_instance().is_base_backup_start(is_backup_started))) {
LOG_WARN("failed to check is base backup started", K(ret));
} else {
// TODO() fix ofs
// const float use_disk_space_radio = OB_FILE_SYSTEM.get_used_macro_block_count() /
// OB_FILE_SYSTEM.get_total_macro_block_count();
// can_schedule = !(use_disk_space_radio >= PAUSE_MERGE_DISK_RADIO && is_backup_started);
// if (!can_schedule) {
// if (REACH_TIME_INTERVAL(PRINT_INTERVAL)) {
// FLOG_INFO("can not schedule merge", K(is_backup_started), K(use_disk_space_radio));
// }
// }
}
return ret;
}
ObFastFreezeChecker::ObFastFreezeChecker(const int64_t tenant_id)
{
reset();