diff --git a/src/share/scheduler/ob_dag_scheduler.h b/src/share/scheduler/ob_dag_scheduler.h index 311ef4bc2..4171c50a3 100644 --- a/src/share/scheduler/ob_dag_scheduler.h +++ b/src/share/scheduler/ob_dag_scheduler.h @@ -340,7 +340,7 @@ public: virtual int set_result(const int32_t result) { UNUSED(result); return common::OB_SUCCESS; } int fill_comment(char *buf, const int64_t buf_len); - virtual bool is_ha_dag() const { return false; } + virtual bool is_ha_dag() const = 0; DECLARE_VIRTUAL_TO_STRING; DISABLE_COPY_ASSIGN(ObIDag); @@ -479,7 +479,7 @@ public: { return OB_SUCCESS; } - virtual bool is_ha_dag_net() const { return false; } + virtual bool is_ha_dag_net() const = 0; public: friend class ObTenantDagScheduler; diff --git a/src/storage/backup/ob_backup_task.h b/src/storage/backup/ob_backup_task.h index df2f830a3..69f51b106 100644 --- a/src/storage/backup/ob_backup_task.h +++ b/src/storage/backup/ob_backup_task.h @@ -219,6 +219,7 @@ public: virtual int64_t hash() const override; virtual lib::Worker::CompatMode get_compat_mode() const override; virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return true; } INHERIT_TO_STRING_KV("ObIDag", ObIDag, K_(is_inited)); private: @@ -244,6 +245,7 @@ public: virtual int64_t hash() const override; virtual lib::Worker::CompatMode get_compat_mode() const override; virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return true; } INHERIT_TO_STRING_KV("ObIDag", ObIDag, K_(is_inited)); private: @@ -275,6 +277,7 @@ public: virtual bool check_can_schedule() override; virtual lib::Worker::CompatMode get_compat_mode() const override; virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return true; } INHERIT_TO_STRING_KV("ObIDag", ObIDag, K_(is_inited)); private: @@ -302,6 +305,7 @@ public: virtual int fill_dag_key(char *buf, const int64_t buf_len) const override; virtual lib::Worker::CompatMode get_compat_mode() const override; virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return true; } INHERIT_TO_STRING_KV("ObIDag", ObIDag, K_(param)); protected: @@ -346,6 +350,7 @@ public: virtual int64_t hash() const override; virtual lib::Worker::CompatMode get_compat_mode() const override; virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return true; } private: int get_file_id_list_(common::ObIArray &file_id_list); @@ -377,6 +382,7 @@ public: virtual int64_t hash() const override; virtual lib::Worker::CompatMode get_compat_mode() const override; virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return true; } private: bool is_inited_; diff --git a/src/storage/compaction/ob_tablet_merge_task.h b/src/storage/compaction/ob_tablet_merge_task.h index f4c154b97..895dbaa2b 100644 --- a/src/storage/compaction/ob_tablet_merge_task.h +++ b/src/storage/compaction/ob_tablet_merge_task.h @@ -224,6 +224,7 @@ public: virtual int64_t to_string(char* buf, const int64_t buf_len) const override; virtual lib::Worker::CompatMode get_compat_mode() const override { return compat_mode_; } virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return false; } static int generate_merge_task( ObBasicTabletMergeDag &merge_dag, ObTabletMergeCtx &ctx, diff --git a/src/storage/ddl/ob_build_index_task.h b/src/storage/ddl/ob_build_index_task.h index e61a6ed78..c03dbd7bb 100644 --- a/src/storage/ddl/ob_build_index_task.h +++ b/src/storage/ddl/ob_build_index_task.h @@ -187,6 +187,7 @@ public: { return compat_mode_; } virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return false; } private: bool is_inited_; uint64_t tenant_id_; diff --git a/src/storage/ddl/ob_complement_data_task.h b/src/storage/ddl/ob_complement_data_task.h index 20d0bdd43..d4a705527 100644 --- a/src/storage/ddl/ob_complement_data_task.h +++ b/src/storage/ddl/ob_complement_data_task.h @@ -155,6 +155,7 @@ public: { return consumer_group_id_; } virtual int create_first_task() override; virtual bool ignore_warning() override; + virtual bool is_ha_dag() const override { return false; } // report replica build status to RS. int report_replica_build_status(); private: diff --git a/src/storage/ddl/ob_ddl_merge_task.h b/src/storage/ddl/ob_ddl_merge_task.h index f8c8fc5b1..2b3e68982 100755 --- a/src/storage/ddl/ob_ddl_merge_task.h +++ b/src/storage/ddl/ob_ddl_merge_task.h @@ -84,6 +84,7 @@ public: { return ddl_param_.compat_mode_; } virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return false; } private: bool is_inited_; ObDDLTableMergeDagParam ddl_param_; diff --git a/src/storage/high_availability/ob_transfer_backfill_tx.h b/src/storage/high_availability/ob_transfer_backfill_tx.h index 1836aab1d..d3149de2f 100644 --- a/src/storage/high_availability/ob_transfer_backfill_tx.h +++ b/src/storage/high_availability/ob_transfer_backfill_tx.h @@ -111,6 +111,7 @@ public: virtual int fill_dag_net_key(char *buf, const int64_t buf_len) const override; virtual int clear_dag_net_ctx(); virtual int deal_with_cancel() override; + virtual bool is_ha_dag_net() const override { return true; } ObTransferBackfillTXCtx *get_ctx() { return &ctx_; } const share::ObLSID &get_ls_id() const { return ctx_.src_ls_id_; } diff --git a/unittest/share/scheduler/test_dag_net_in_dag_scheduler.cpp b/unittest/share/scheduler/test_dag_net_in_dag_scheduler.cpp index 34b862e6a..ce56e36f5 100644 --- a/unittest/share/scheduler/test_dag_net_in_dag_scheduler.cpp +++ b/unittest/share/scheduler/test_dag_net_in_dag_scheduler.cpp @@ -160,6 +160,7 @@ public: { return lib::Worker::CompatMode::MYSQL; } virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return false; } INHERIT_TO_STRING_KV("ObIDag", ObIDag, K_(is_inited), K_(type), K_(id), K(task_list_.get_size()), K_(dag_ret)); @@ -763,7 +764,7 @@ public: { UNUSEDx(buf, buf_len); return OB_SUCCESS; } virtual int fill_dag_net_key(char *buf, const int64_t buf_len) const override { UNUSEDx(buf, buf_len); return OB_SUCCESS; } - + virtual bool is_ha_dag_net() const override { return false; } INHERIT_TO_STRING_KV("ObIDagNet", ObIDagNet, K_(type), K_(id)); private: diff --git a/unittest/share/scheduler/test_dag_scheduler.cpp b/unittest/share/scheduler/test_dag_scheduler.cpp index 14efb1e54..16f53a382 100644 --- a/unittest/share/scheduler/test_dag_scheduler.cpp +++ b/unittest/share/scheduler/test_dag_scheduler.cpp @@ -444,6 +444,7 @@ public: { return lib::Worker::CompatMode::MYSQL; } virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return false; } VIRTUAL_TO_STRING_KV(K_(is_inited), K_(type), K_(id), K(task_list_.get_size())); protected: int64_t id_; diff --git a/unittest/storage/test_dag_warning_history.cpp b/unittest/storage/test_dag_warning_history.cpp index e7d9c2ebf..7b6c4115b 100644 --- a/unittest/storage/test_dag_warning_history.cpp +++ b/unittest/storage/test_dag_warning_history.cpp @@ -106,6 +106,7 @@ public: { return lib::Worker::CompatMode::MYSQL; } virtual uint64_t get_consumer_group_id() const override { return consumer_group_id_; } + virtual bool is_ha_dag() const override { return false; } INHERIT_TO_STRING_KV("ObIDag", ObIDag, K_(is_inited), K_(type), K(task_list_.get_size()), K_(dag_ret)); private: