Skip to content

Commit f36e76e

Browse files
obdevhnwyllmm
andcommitted
delete archive service
Co-authored-by: hnwyllmm <hnwyllmm@users.noreply.github.com>
1 parent e4ef5c0 commit f36e76e

7 files changed

Lines changed: 1 addition & 53 deletions

File tree

mittest/logservice/archiveservice/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#log_unittest(test_archive_file_utils)
55

66
set(ARCHIVE_TEST_SRCS
7-
basic_archive.cpp
87
fake_archive_piece_mgr.cpp)
98

109
add_library(archive_test ${ARCHIVE_TEST_SRCS})

src/logservice/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -210,26 +210,9 @@ ob_set_subtarget(ob_logservice logrouteservice
210210
ob_set_subtarget(ob_logservice archiveservice
211211
archiveservice/dynamic_buffer.cpp
212212
archiveservice/large_buffer_pool.cpp
213-
archiveservice/ob_archive_allocator.cpp
214213
archiveservice/ob_archive_define.cpp
215-
archiveservice/ob_archive_fetcher.cpp
216214
archiveservice/ob_archive_file_utils.cpp
217-
archiveservice/ob_archive_io.cpp
218-
archiveservice/ob_archive_persist_mgr.cpp
219-
archiveservice/ob_archive_round_mgr.cpp
220-
archiveservice/ob_archive_scheduler.cpp
221-
archiveservice/ob_archive_sender.cpp
222-
archiveservice/ob_archive_sequencer.cpp
223-
archiveservice/ob_archive_service.cpp
224-
archiveservice/ob_archive_task_queue.cpp
225-
archiveservice/ob_archive_task.cpp
226-
archiveservice/ob_archive_timer.cpp
227215
archiveservice/ob_archive_util.cpp
228-
archiveservice/ob_ls_meta_record_task.cpp
229-
archiveservice/ob_ls_meta_recorder.cpp
230-
archiveservice/ob_ls_mgr.cpp
231-
archiveservice/ob_ls_task.cpp
232-
archiveservice/ob_start_archive_helper.cpp
233216
)
234217

235218
ob_server_add_target(ob_logservice)

src/logservice/archiveservice/ob_archive_util.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ namespace archive
2525
{
2626
using oceanbase::palf::LSN;
2727

28-
#define GET_LS_TASK_CTX(mgr, id) \
29-
ObArchiveLSGuard guard(mgr); \
30-
ObLSArchiveTask *ls_archive_task = NULL; \
31-
if (OB_FAIL(mgr->get_ls_guard(id, guard))) { \
32-
ARCHIVE_LOG(WARN, "get ls guard failed", K(ret), K(id)); \
33-
} else if (OB_ISNULL(ls_archive_task = guard.get_ls_task())) { \
34-
ret = OB_ERR_UNEXPECTED; \
35-
ARCHIVE_LOG(ERROR, "ls task is NULL", K(ret), K(id)); \
36-
} \
37-
if (OB_SUCC(ret))
38-
3928
int64_t cal_archive_file_id(const LSN &lsn, const int64_t N);
4029
// Not support concurrent
4130
struct SimpleQueue

src/logservice/restoreservice/ob_log_restore_allocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ char *ObLogRestoreAllocator::alloc_iterator_buffer(const int64_t size)
6060
char *data = NULL;
6161

6262
if (OB_UNLIKELY(! inited_)) {
63-
ARCHIVE_LOG_RET(WARN, OB_NOT_INIT, "ObArchiveAllocator not init");
63+
ARCHIVE_LOG_RET(WARN, OB_NOT_INIT, "ObLogRestoreAllocator not init");
6464
} else if (OB_ISNULL(data = static_cast<char *>(iterator_buf_allocator_.acquire(size)))) {
6565
// alloc fail
6666
} else {

src/observer/omt/ob_multi_tenant.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "share/allocator/ob_shared_memory_allocator_mgr.h" // ObSharedMemAllocMgr
3030
#include "share/ob_global_autoinc_service.h"
3131
#include "ob_tenant_mtl_helper.h"
32-
#include "logservice/archiveservice/ob_archive_service.h"
3332
#include "storage/concurrency_control/ob_multi_version_garbage_collector.h"
3433
#include "storage/tx/ob_tx_loop_worker.h"
3534
#include "storage/tx/ob_timestamp_service.h"
@@ -105,7 +104,6 @@ using namespace oceanbase::concurrency_control;
105104
using namespace oceanbase::transaction;
106105
using namespace oceanbase::transaction::tablelock;
107106
using namespace oceanbase::logservice;
108-
using namespace oceanbase::archive;
109107
using namespace oceanbase::observer;
110108
using namespace oceanbase::rootserver;
111109
using namespace oceanbase::blocksstable;
@@ -274,7 +272,6 @@ int ObMultiTenant::init(ObAddr myaddr,
274272
MTL_BIND2(mtl_new_default, ObTenantStorageMetaService::mtl_init, mtl_start_default, mtl_stop_default, mtl_wait_default, mtl_destroy_default);
275273

276274
// other mtl
277-
MTL_BIND2(mtl_new_default, ObArchiveService::mtl_init, mtl_start_default, mtl_stop_default, mtl_wait_default, mtl_destroy_default);
278275
MTL_BIND2(mtl_new_default, compaction::ObTenantTabletScheduler::mtl_init, mtl_start_default, mtl_stop_default, mtl_wait_default, mtl_destroy_default);
279276
MTL_BIND2(mtl_new_default, compaction::ObTenantMediumChecker::mtl_init, nullptr, nullptr, nullptr, mtl_destroy_default);
280277
MTL_BIND2(mtl_new_default, ObTabletTableUpdater::mtl_init, nullptr, mtl_stop_default, mtl_wait_default, mtl_destroy_default);

src/share/rc/ob_tenant_base.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ namespace datadict
147147
{
148148
class ObDataDictService;
149149
}
150-
namespace archive
151-
{
152-
class ObArchiveService;
153-
}
154150
namespace compaction
155151
{
156152
class ObTenantCompactionProgressMgr;
@@ -335,7 +331,6 @@ using ObTableScanIteratorObjPool = common::ObServerObjectPool<oceanbase::storage
335331
storage::ObTenantFreezer*, \
336332
storage::checkpoint::ObCheckPointService *, \
337333
storage::checkpoint::ObTabletGCService *, \
338-
archive::ObArchiveService*, \
339334
compaction::ObTenantTabletScheduler*, \
340335
compaction::ObTenantMediumChecker*, \
341336
storage::ObTenantCompactionMemPool*, \

src/storage/tx_storage/ob_checkpoint_service.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
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

2524
namespace 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

Comments
 (0)