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

fix argument mistake of cancel_dag

Browse Source
This commit is contained in:
Tsunaou
2024-04-01 14:50:04 +00:00
committed by ob-robot
parent 644277966a
commit 1a9075819b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/backup/ob_backup_task.cpp
View File

@ -410,19 +410,19 @@ int ObLSBackupMetaDagNet::start_running()
LOG_WARN("failed to add dag", K(ret), KP(finish_dag));
} else if (OB_FAIL(dag_scheduler->add_dag(prepare_dag))) {
LOG_WARN("failed to add dag", K(ret), KP(prepare_dag));
if (OB_TMP_FAIL(dag_scheduler->cancel_dag(finish_dag, prepare_dag))) {
if (OB_TMP_FAIL(dag_scheduler->cancel_dag(finish_dag))) {
LOG_ERROR("failed to cancel backup dag", K(tmp_ret), KP(dag_scheduler), KP(finish_dag));
} else {
finish_dag = nullptr;
}
} else if (OB_FAIL(dag_scheduler->add_dag(backup_meta_dag))) {
LOG_WARN("failed to add dag", K(ret), KP(prepare_dag));
if (OB_TMP_FAIL(dag_scheduler->cancel_dag(finish_dag, prepare_dag))) {
if (OB_TMP_FAIL(dag_scheduler->cancel_dag(finish_dag))) {
LOG_ERROR("failed to cancel backup dag", K(tmp_ret), KP(dag_scheduler), KP(finish_dag));
} else {
finish_dag = nullptr;
}
if (OB_TMP_FAIL(dag_scheduler->cancel_dag(prepare_dag, backup_meta_dag))) {
if (OB_TMP_FAIL(dag_scheduler->cancel_dag(prepare_dag))) {
LOG_ERROR("failed to cancel backup dag", K(tmp_ret), KP(dag_scheduler), KP(prepare_dag));
} else {
prepare_dag = nullptr;

4
src/storage/high_availability/ob_transfer_backfill_tx.cpp
View File

@ -705,7 +705,7 @@ int ObTransferBackfillTXDagNet::start_running_for_backfill_()
ret = OB_EAGAIN;
}
if (OB_NOT_NULL(replace_logical_dag)) {
if (OB_SUCCESS != (tmp_ret = scheduler->cancel_dag(replace_logical_dag, backfill_tx_dag))) {
if (OB_SUCCESS != (tmp_ret = scheduler->cancel_dag(replace_logical_dag))) {
LOG_WARN("failed to cancel replace logical dag", K(tmp_ret), KPC(backfill_tx_dag));
} else {
replace_logical_dag = nullptr;
@ -1130,7 +1130,7 @@ int ObStartTransferBackfillTXTask::generate_transfer_backfill_tx_dags_()
ret = OB_EAGAIN;
}
if (OB_NOT_NULL(tablet_backfill_tx_dag)) {
if (OB_SUCCESS != (tmp_ret = scheduler->cancel_dag(tablet_backfill_tx_dag, backfill_tx_dag))) {
if (OB_SUCCESS != (tmp_ret = scheduler->cancel_dag(tablet_backfill_tx_dag))) {
LOG_WARN("failed to cancel tablet backfill tx dag", K(tmp_ret), KPC(backfill_tx_dag));
} else {
tablet_backfill_tx_dag = nullptr;