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

Fix incompatible of mds merge and diagnose

Browse Source
This commit is contained in:
Tsunaou
2024-03-29 04:21:25 +00:00
committed by ob-robot
parent 4c26f10dcf
commit 83fc4fb72d
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/share/scheduler/ob_dag_scheduler_config.h
View File

@ -62,6 +62,7 @@ DAG_SCHEDULER_DAG_TYPE_DEF(DAG_TYPE_MDS_MINI_MERGE, ObDagPrio::DAG_PRIO_COMPACTI
false, 3, {"ls_id", "tablet_id", "flush_scn"})
DAG_SCHEDULER_DAG_TYPE_DEF(DAG_TYPE_BATCH_FREEZE_TABLETS, ObDagPrio::DAG_PRIO_COMPACTION_HIGH, ObSysTaskType::BATCH_FREEZE_TABLET_TASK, "BATCH_FREEZE", "COMPACTION",
false, 2, {"ls_id", "tablet_count"})
// NOTICE: if you add/delete a compaction dag type here, remember to alter function is_compaction_dag and get_diagnose_tablet_type in ob_tenant_dag_scheduler.h
DAG_SCHEDULER_DAG_TYPE_DEF(DAG_TYPE_DDL, ObDagPrio::DAG_PRIO_DDL, ObSysTaskType::DDL_TASK, "DDL_COMPLEMENT", "DDL",
true, 7, {"ls_id", "source_tablet_id", "dest_tablet_id", "data_table_id", "target_table_id", "schema_version", "snapshot_version"})

3
src/share/scheduler/ob_diagnose_config.h
View File

@ -76,6 +76,9 @@ enum ObDiagnoseTabletType {
TYPE_MEDIUM_MERGE, // for medium & major in storage
TYPE_REPORT,
TYPE_RS_MAJOR_MERGE, // for tenant major in RS
TYPE_TX_TABLE_MERGE,
TYPE_MDS_MINI_MERGE,
TYPE_BATCH_FREEZE,
TYPE_DIAGNOSE_TABLET_MAX
};

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

@ -373,6 +373,12 @@ public:
} else if (ObDagType::ObDagTypeEnum::DAG_TYPE_MAJOR_MERGE <= type
&& ObDagType::ObDagTypeEnum::DAG_TYPE_CO_MERGE_FINISH >= type) {
diagnose_type = ObDiagnoseTabletType::TYPE_MEDIUM_MERGE;
} else if (ObDagType::ObDagTypeEnum::DAG_TYPE_TX_TABLE_MERGE == type) {
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) {
diagnose_type = ObDiagnoseTabletType::TYPE_BATCH_FREEZE;
}
return diagnose_type;
}