allow force stop archive

This commit is contained in:
wxhwang
2024-01-22 04:43:22 +00:00
committed by ob-robot
parent 09cd15492e
commit 932565d6ca
9 changed files with 95 additions and 7 deletions

View File

@ -312,7 +312,7 @@ int ObArchiveSchedulerService::process_()
if (OB_FAIL(ret)) {
} else if (no_dest) {
} else if (archive_mode.is_noarchivelog()) {
if (no_round || round.state_.is_stop()) {
if (no_round || round.state_.is_stop() || round.state_.is_stopping()) {
} else if (OB_FAIL(tenant_scheduler.disable_archive(dest_no))) {
LOG_WARN("failed to disable archive", K(ret), K(tenant_id), K(dest_no), K(dest_state));
}

View File

@ -763,6 +763,7 @@ int ObArchiveHandler::do_checkpoint_(share::ObTenantArchiveRoundAttr &round_info
ObDestRoundCheckpointer checkpointer;
SCN max_checkpoint_scn = SCN::min_scn();
bool can = false;
bool allow_force_stop = false;
if (OB_FAIL(ObTenantArchiveMgr::decide_piece_id(round_info.start_scn_, round_info.base_piece_id_, round_info.piece_switch_interval_, round_info.checkpoint_scn_, since_piece_id))) {
LOG_WARN("failed to calc since piece id", K(ret), K(round_info));
} else if (OB_FAIL(archive_table_op_.get_dest_round_summary(*sql_proxy_, round_info.dest_id_, round_info.round_id_, since_piece_id, summary))) {
@ -776,6 +777,9 @@ int ObArchiveHandler::do_checkpoint_(share::ObTenantArchiveRoundAttr &round_info
LOG_WARN("tenant can not do archive", K(ret), K_(tenant_id));
} else if (OB_FAIL(checkpointer.init(&round_handler_, piece_generated_cb, round_checkpoint_cb, max_checkpoint_scn))) {
LOG_WARN("failed to init checkpointer", K(ret), K(round_info));
} else if (round_info.state_.is_stopping() && OB_FAIL(check_allow_force_stop_(round_info, allow_force_stop))) {
LOG_WARN("failed to check allow force stop", K(ret), K(round_info));
} else if (allow_force_stop && OB_FALSE_IT(checkpointer.set_allow_force_stop())) {
} else if (OB_FAIL(checkpointer.checkpoint(round_info, summary))) {
LOG_WARN("failed to do checkpoint.", K(ret), K(round_info), K(summary));
}
@ -835,3 +839,23 @@ int ObArchiveHandler::get_max_checkpoint_scn_(const uint64_t tenant_id, SCN &max
}
return ret;
}
int ObArchiveHandler::check_allow_force_stop_(const ObTenantArchiveRoundAttr &round, bool &allow_force_stop) const
{
int ret = OB_SUCCESS;
int64_t stopping_ts = 0;
const int64_t current_ts = ObTimeUtility::current_time();
#ifdef ERRSIM
const int64_t force_stop_threshold = GCONF.errsim_allow_force_archive_threshold;;
#else
const int64_t force_stop_threshold = ALLOW_FORCE_STOP_THRESHOLD;
#endif
allow_force_stop = false;
if (OB_FAIL(archive_table_op_.get_round_stopping_ts(*sql_proxy_, round.key_.dest_no_, stopping_ts))) {
LOG_WARN("failed to get round stopping ts.", K(ret), K(round));
} else {
allow_force_stop = force_stop_threshold <= (current_ts - stopping_ts);
}
return ret;
}

View File

@ -66,8 +66,10 @@ private:
int do_checkpoint_(share::ObTenantArchiveRoundAttr &round_info);
int check_archive_dest_validity_(const int64_t dest_no);
int get_max_checkpoint_scn_(const uint64_t tenant_id, share::SCN &max_checkpoint_scn) const;
int check_allow_force_stop_(const ObTenantArchiveRoundAttr &round, bool &allow_force_stop) const;
private:
static const int64_t ALLOW_FORCE_STOP_THRESHOLD = 10_min;
bool is_inited_;
uint64_t tenant_id_; // user tenant id
obrpc::ObSrvRpcProxy *rpc_proxy_;