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

[CP] choose sys ls server to backup complement log task.

Browse Source
This commit is contained in:
hamstersox
2023-09-26 09:43:57 +00:00
committed by ob-robot
parent 83dac66d0e
commit 941dd415c7
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rootserver/backup/ob_backup_data_scheduler.cpp
View File

@ -141,7 +141,8 @@ int ObBackupDataScheduler::do_get_need_reload_task_(
ObBackupLSTaskAttr &ls_task = ls_tasks.at(i); ObBackupLSTaskAttr &ls_task = ls_tasks.at(i);
ObBackupScheduleTask *task = nullptr; ObBackupScheduleTask *task = nullptr;
bool is_dropped = false; bool is_dropped = false;
if (OB_FAIL(ObBackupDataLSTaskMgr::check_ls_is_dropped(ls_task, *sql_proxy_, is_dropped))) { if (!(job.plus_archivelog_ && set_task_attr.status_.is_backup_log())
&& OB_FAIL(ObBackupDataLSTaskMgr::check_ls_is_dropped(ls_task, *sql_proxy_, is_dropped))) {
LOG_WARN("failed to check ls is dropped", K(ret), K(ls_task)); LOG_WARN("failed to check ls is dropped", K(ret), K(ls_task));
} else if (is_dropped) { } else if (is_dropped) {
// ls deleted, no need to reload, mark it to finish // ls deleted, no need to reload, mark it to finish

2
src/rootserver/backup/ob_backup_schedule_task.cpp
View File

@ -412,7 +412,7 @@ int ObBackupDataBaseTask::set_optional_servers_(const ObIArray<common::ObAddr> &
uint64_t tenant_id = get_tenant_id(); uint64_t tenant_id = get_tenant_id();
share::ObLSTableOperator *lst_operator = GCTX.lst_operator_; share::ObLSTableOperator *lst_operator = GCTX.lst_operator_;
int64_t cluster_id = GCONF.cluster_id; int64_t cluster_id = GCONF.cluster_id;
ObLSID server_ls_id = ls_id_.id() == 0 ? ObLSID(ObLSID::SYS_LS_ID) : ls_id_; ObLSID server_ls_id = execute_on_sys_server_() ? ObLSID(ObLSID::SYS_LS_ID) : ls_id_;
if (nullptr == lst_operator) { if (nullptr == lst_operator) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("lst_operator ptr is null", K(ret)); LOG_WARN("lst_operator ptr is null", K(ret));

5
src/rootserver/backup/ob_backup_schedule_task.h
View File

@ -272,6 +272,7 @@ public:
private: private:
virtual int do_update_dst_and_doing_status_(common::ObISQLClient &sql_proxy, common::ObAddr &dst, virtual int do_update_dst_and_doing_status_(common::ObISQLClient &sql_proxy, common::ObAddr &dst,
share::ObTaskId &trace_id) final override; share::ObTaskId &trace_id) final override;
virtual bool execute_on_sys_server_() const { return false; }
bool check_replica_in_black_server_(const share::ObLSReplica &replica, const ObIArray<common::ObAddr> &black_servers); bool check_replica_in_black_server_(const share::ObLSReplica &replica, const ObIArray<common::ObAddr> &black_servers);
public: public:
INHERIT_TO_STRING_KV("ObBackupScheduleTask", ObBackupScheduleTask, K_(incarnation_id), K_(backup_set_id), INHERIT_TO_STRING_KV("ObBackupScheduleTask", ObBackupScheduleTask, K_(incarnation_id), K_(backup_set_id),
@ -315,10 +316,11 @@ public:
virtual int64_t get_deep_copy_size() const override; virtual int64_t get_deep_copy_size() const override;
virtual int execute(obrpc::ObSrvRpcProxy &rpc_proxy) const override; virtual int execute(obrpc::ObSrvRpcProxy &rpc_proxy) const override;
virtual int build(const share::ObBackupJobAttr &job_attr, const share::ObBackupSetTaskAttr &set_task_attr, virtual int build(const share::ObBackupJobAttr &job_attr, const share::ObBackupSetTaskAttr &set_task_attr,
const share::ObBackupLSTaskAttr &ls_attr); const share::ObBackupLSTaskAttr &ls_attr);
private: private:
int calc_start_replay_scn_(const share::ObBackupJobAttr &job_attr, const share::ObBackupSetTaskAttr &set_task_attr, int calc_start_replay_scn_(const share::ObBackupJobAttr &job_attr, const share::ObBackupSetTaskAttr &set_task_attr,
const share::ObBackupLSTaskAttr &ls_attr, share::SCN &scn); const share::ObBackupLSTaskAttr &ls_attr, share::SCN &scn);
bool execute_on_sys_server_() const override { return true; }
private: private:
DISALLOW_COPY_AND_ASSIGN(ObBackupComplLogTask); DISALLOW_COPY_AND_ASSIGN(ObBackupComplLogTask);
}; };
@ -332,6 +334,7 @@ public:
virtual int64_t get_deep_copy_size() const override; virtual int64_t get_deep_copy_size() const override;
virtual int execute(obrpc::ObSrvRpcProxy &rpc_proxy) const override; virtual int execute(obrpc::ObSrvRpcProxy &rpc_proxy) const override;
private: private:
bool execute_on_sys_server_() const override { return true; }
DISALLOW_COPY_AND_ASSIGN(ObBackupBuildIndexTask); DISALLOW_COPY_AND_ASSIGN(ObBackupBuildIndexTask);
}; };