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

fix backup overwrite comment

Browse Source
This commit is contained in:
hamstersox
2023-09-01 09:10:40 +00:00
committed by ob-robot
parent beb8db4bc3
commit bee9ea154a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -959,7 +959,8 @@ int ObBackupDataScheduler::process()
LOG_WARN("[DATA_BACKUP]failed to init tenant backup job mgr", K(ret), K_(tenant_id), K(job_attr)); LOG_WARN("[DATA_BACKUP]failed to init tenant backup job mgr", K(ret), K_(tenant_id), K(job_attr));
} else if (OB_SUCCESS != (tmp_ret = job_mgr->process())) { // tenant level backups are isolated } else if (OB_SUCCESS != (tmp_ret = job_mgr->process())) { // tenant level backups are isolated
LOG_WARN("[DATA_BACKUP]failed to schedule tenant backup job", K(tmp_ret), K_(tenant_id), K(job_attr)); LOG_WARN("[DATA_BACKUP]failed to schedule tenant backup job", K(tmp_ret), K_(tenant_id), K(job_attr));
if (!is_sys_tenant(tenant_id_) && OB_SUCCESS != (tmp_ret = handle_failed_job_(tenant_id_, tmp_ret, *job_mgr, job_attr))) { if (job_attr.status_.is_backup_finish()) { // completed, failed or canceled job no need to deal error code
} else if (!is_sys_tenant(tenant_id_) && OB_SUCCESS != (tmp_ret = handle_failed_job_(tenant_id_, tmp_ret, *job_mgr, job_attr))) {
LOG_WARN("failed to handle user tenant failed job", K(tmp_ret), K(job_attr)); LOG_WARN("failed to handle user tenant failed job", K(tmp_ret), K(job_attr));
} else { } else {
backup_service_->wakeup(); backup_service_->wakeup();

1
src/share/backup/ob_backup_struct.h
View File

@ -1212,6 +1212,7 @@ public:
bool is_backup_minor() const { return BACKUP_DATA_MINOR == status_; } bool is_backup_minor() const { return BACKUP_DATA_MINOR == status_; }
bool is_backup_log() const { return BACKUP_LOG == status_; } bool is_backup_log() const { return BACKUP_LOG == status_; }
bool is_backup_sys() const { return BACKUP_DATA_SYS == status_; } bool is_backup_sys() const { return BACKUP_DATA_SYS == status_; }
bool is_backup_finish() const { return COMPLETED == status_ || FAILED == status_ || CANCELED == status_; }
const char* get_str() const; const char* get_str() const;
int set_status(const char *str); int set_status(const char *str);
int get_backup_data_type(share::ObBackupDataType &backup_data_type) const; int get_backup_data_type(share::ObBackupDataType &backup_data_type) const;