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

async tablet force freeze in mini merge dag when queuing table case

Browse Source
This commit is contained in:
Tsunaou
2024-06-28 09:17:03 +00:00
committed by ob-robot
parent bf0d6d75f7
commit 93a19cedf5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/scheduler/ob_tenant_dag_scheduler.h
View File

@ -384,7 +384,7 @@ public:
diagnose_type = ObDiagnoseTabletType::TYPE_TX_TABLE_MERGE;
} else if (ObDagType::ObDagTypeEnum::DAG_TYPE_MDS_MINI_MERGE == type) {
diagnose_type = ObDiagnoseTabletType::TYPE_MDS_MINI_MERGE;
} else if (ObDagType::ObDagTypeEnum::DAG_TYPE_BATCH_FREEZE_TABLETS) {
} else if (ObDagType::ObDagTypeEnum::DAG_TYPE_BATCH_FREEZE_TABLETS == type) {
diagnose_type = ObDiagnoseTabletType::TYPE_BATCH_FREEZE;
}
return diagnose_type;

2
src/storage/compaction/ob_tenant_tablet_scheduler.cpp
View File

@ -1213,7 +1213,7 @@ int ObTenantTabletScheduler::schedule_tablet_medium_merge(
LOG_WARN("failed to try schedule tablet medium", K(ret), K(ls_handle), K(ls_id), K(tablet_handle),
K(weak_read_ts), K(medium_param), K(unused_tablet_merge_finish));
} else if (schedule_pair.need_force_freeze()) {
if (OB_TMP_FAIL(MTL(ObTenantFreezer *)->tablet_freeze(tablet_id, true/*force_freeze*/, true/*is_sync*/))) {
if (OB_TMP_FAIL(MTL(ObTenantFreezer *)->tablet_freeze(tablet_id, true/*force_freeze*/, false/*is_sync*/))) {
LOG_WARN("failed to force freeze tablet", K(tmp_ret), K(ls_id), K(tablet_id));
}
}