diff --git a/src/rootserver/restore/ob_recover_table_initiator.cpp b/src/rootserver/restore/ob_recover_table_initiator.cpp index 5ef30722f6..dbf612013d 100644 --- a/src/rootserver/restore/ob_recover_table_initiator.cpp +++ b/src/rootserver/restore/ob_recover_table_initiator.cpp @@ -109,10 +109,6 @@ int ObRecoverTableInitiator::start_recover_table_(const obrpc::ObRecoverTableArg LOG_WARN("failed to insert sys recover table job", K(ret)); } else { LOG_INFO("initiate recover table succeed", K(ret), K(job)); - int tmp_ret = OB_SUCCESS; - if (OB_SUCCESS != (tmp_ret = insert_user_job_(job))) { - LOG_WARN("failed to insert user job", K(ret), K(job)); - } } uint64_t tenant_id = arg.tenant_id_; int64_t job_id = job.get_job_id(); @@ -150,43 +146,6 @@ int ObRecoverTableInitiator::cancel_recover_table_(const obrpc::ObRecoverTableAr return ret; } -int ObRecoverTableInitiator::insert_user_job_(share::ObRecoverTableJob &job) -{ - int ret = OB_SUCCESS; - ObMySQLTransaction trans; - int64_t job_id = -1; - const int64_t initiator_job_id = job.get_job_id(); // sys job id - const uint64_t exec_tenant_id = gen_meta_tenant_id(job.get_target_tenant_id()); - if (OB_FAIL(trans.start(sql_proxy_, exec_tenant_id))) { - LOG_WARN("failed to start trans", K(ret)); - } else { - share::ObRecoverTablePersistHelper helper; - if (OB_FAIL(ObLSBackupInfoOperator::get_next_job_id(trans, exec_tenant_id, job_id))) { - LOG_WARN("failed to get next job_id", K(ret)); - } else if (OB_FALSE_IT(job.set_tenant_id(job.get_target_tenant_id()))) { - } else if (OB_FALSE_IT(job.set_initiator_tenant_id(OB_SYS_TENANT_ID))) { - } else if (OB_FALSE_IT(job.set_job_id(job_id))) { - } else if (OB_FALSE_IT(job.set_initiator_job_id(initiator_job_id))) { - } else if (OB_FALSE_IT(job.set_start_ts(ObTimeUtility::current_time()))) { - } else if (OB_FAIL(helper.init(job.get_tenant_id()))) { - LOG_WARN("failed to init table op", K(ret), "tenant_id", job.get_tenant_id()); - } else if (OB_FAIL(helper.insert_recover_table_job(trans, job))) { - LOG_WARN("failed to insert initial recover table job", K(ret), K(job)); - } - if (OB_SUCC(ret)) { - if (OB_FAIL(trans.end(true))) { - LOG_WARN("failed to commit trans", K(ret)); - } - } else { - int tmp_ret = OB_SUCCESS; - if (OB_SUCCESS != (tmp_ret = trans.end(false))) { - LOG_WARN("failed to rollback trans", K(tmp_ret)); - } - } - } - return ret; -} - int ObRecoverTableInitiator::insert_sys_job_( share::ObRecoverTableJob &job, share::ObPhysicalRestoreJob &physical_restore_job) { diff --git a/src/rootserver/restore/ob_recover_table_initiator.h b/src/rootserver/restore/ob_recover_table_initiator.h index 4463e3b484..74ee8e0e98 100644 --- a/src/rootserver/restore/ob_recover_table_initiator.h +++ b/src/rootserver/restore/ob_recover_table_initiator.h @@ -67,7 +67,6 @@ private: int fill_recover_table_arg_( const obrpc::ObRecoverTableArg &arg, share::ObRecoverTableJob &job); int insert_sys_job_(share::ObRecoverTableJob &job, share::ObPhysicalRestoreJob &physical_restore_job); - int insert_user_job_(share::ObRecoverTableJob &job); int fill_recover_database(const share::ObImportArg &import_arg, share::ObImportTableArg &import_table_arg); int fill_recover_table(const share::ObImportArg &import_arg, share::ObImportTableArg &import_table_arg); int fill_recover_partition(const share::ObImportArg &import_arg, share::ObImportTableArg &import_table_arg);