2020#include " logservice/ob_log_service.h"
2121#include " share/ob_global_stat_proxy.h"
2222#include " observer/ob_server_struct.h"
23- #include " logservice/archiveservice/ob_archive_service.h"
2423
2524namespace oceanbase
2625{
@@ -159,10 +158,6 @@ void ObCheckPointService::ObCheckpointTask::runTimerTask()
159158 ObCheckpointExecutor *checkpoint_executor = nullptr ;
160159 ObDataCheckpoint *data_checkpoint = nullptr ;
161160 palf::LSN checkpoint_lsn;
162- palf::LSN archive_lsn;
163- SCN unused_archive_scn;
164- bool archive_force_wait = false ;
165- bool archive_ignore = false ;
166161 if (OB_FAIL (ls_svr->get_ls (ls->get_ls_id (), ls_handle, ObLSGetMod::APPLY_MOD))) {
167162 STORAGE_LOG (WARN, " get log stream failed" , K (ret), K (ls->get_ls_id ()));
168163 } else if (OB_ISNULL (ls = ls_handle.get_ls ())) {
@@ -181,18 +176,8 @@ void ObCheckPointService::ObCheckpointTask::runTimerTask()
181176 } else if (OB_FAIL (ObGlobalStatProxy::get_change_stream_min_dep_lsn (
182177 *GCTX.sql_proxy_ , MTL_ID (), false /* for_update*/ , cs_min_dep_lsn_val))) {
183178 STORAGE_LOG (WARN, " get_change_stream_min_dep_lsn failed, skip constraint" , KR (ret));
184- } else if (OB_FAIL (MTL (archive::ObArchiveService*)->get_ls_archive_progress (ls->get_ls_id (),
185- archive_lsn, unused_archive_scn, archive_force_wait, archive_ignore))) {
186- STORAGE_LOG (WARN, " get ls archive progress failed" , K (ret), K (ls->get_ls_id ()));
187179 } else {
188180 checkpoint_lsn = ls->get_clog_base_lsn ();
189- if (! archive_force_wait || archive_ignore || archive_lsn >= checkpoint_lsn) {
190- // do nothing
191- } else {
192- STORAGE_LOG (TRACE, " archive_lsn small than checkpoint_lsn, set base_lsn with archive_lsn" ,
193- K (archive_lsn), K (checkpoint_lsn), KPC (ls));
194- checkpoint_lsn = archive_lsn;
195- }
196181 palf::LSN cs_min_dep_lsn = palf::LSN (cs_min_dep_lsn_val);
197182 if (cs_min_dep_lsn < checkpoint_lsn) {
198183 FLOG_INFO (" [CHECKPOINT] constrain base_lsn by change_stream_min_dep_lsn" ,
0 commit comments