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

[CP] fix check ls gc in standby when the tenant switchover to primary and its ls list not match with the original

Browse Source
This commit is contained in:
taoshuning
2023-11-17 09:11:02 +00:00
committed by ob-robot
parent 04e3c081d2
commit ef10ca0873
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/ob_garbage_collector.cpp
View File

@ -29,6 +29,7 @@
#include "share/ob_srv_rpc_proxy.h" #include "share/ob_srv_rpc_proxy.h"
#include "share/rc/ob_tenant_base.h" #include "share/rc/ob_tenant_base.h"
#include "share/ls/ob_ls_life_manager.h" #include "share/ls/ob_ls_life_manager.h"
#include "share/ob_debug_sync.h"
#include "storage/tx_storage/ob_ls_handle.h" #include "storage/tx_storage/ob_ls_handle.h"
#include "rootserver/ob_ls_recovery_reportor.h" // ObLSRecoveryReportor #include "rootserver/ob_ls_recovery_reportor.h" // ObLSRecoveryReportor
#include "rootserver/ob_tenant_info_loader.h" // ObTenantInfoLoader #include "rootserver/ob_tenant_info_loader.h" // ObTenantInfoLoader
@ -1033,6 +1034,7 @@ void ObGCHandler::block_ls_transfer_in_(const SCN &block_scn)
void ObGCHandler::offline_ls_(const SCN &offline_scn) void ObGCHandler::offline_ls_(const SCN &offline_scn)
{ {
DEBUG_SYNC(LS_GC_BEFORE_OFFLINE);
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
LSGCState gc_state = INVALID_LS_GC_STATE; LSGCState gc_state = INVALID_LS_GC_STATE;
ObLSID ls_id = ls_->get_ls_id(); ObLSID ls_id = ls_->get_ls_id();

33
src/logservice/restoreservice/ob_log_restore_handler.cpp
View File

@ -941,8 +941,9 @@ int ObLogRestoreHandler::check_offline_log_(bool &done)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
share::SCN replayed_scn; share::SCN replayed_scn;
palf::LSN replayed_lsn;
palf::PalfHandleGuard guard; palf::PalfHandleGuard guard;
palf::PalfGroupBufferIterator iter; palf::PalfBufferIterator iter;
done = false; done = false;
if (OB_FAIL(MTL(ObLogService*)->get_log_replay_service()->get_max_replayed_scn( if (OB_FAIL(MTL(ObLogService*)->get_log_replay_service()->get_max_replayed_scn(
share::ObLSID(id_), replayed_scn))) { share::ObLSID(id_), replayed_scn))) {
@ -951,31 +952,37 @@ int ObLogRestoreHandler::check_offline_log_(bool &done)
CLOG_LOG(WARN, "open_palf failed", K(id_)); CLOG_LOG(WARN, "open_palf failed", K(id_));
// rewrite ret_code // rewrite ret_code
ret = OB_EAGAIN; ret = OB_EAGAIN;
} else if (OB_FAIL(guard.seek(replayed_scn, iter))) { } else if (OB_FAIL(guard.locate_by_scn_coarsely(replayed_scn, replayed_lsn))) {
CLOG_LOG(WARN, "seek failed", K(id_)); CLOG_LOG(WARN, "locate failed", K(id_), K(replayed_scn));
} else if (OB_FAIL(guard.seek(replayed_lsn, iter))) {
CLOG_LOG(WARN, "seek failed", K(id_), K(replayed_lsn));
} else { } else {
palf::LogGroupEntry entry; palf::LogEntry entry;
palf::LSN lsn; palf::LSN lsn;
while (OB_SUCC(ret)) { while (OB_SUCC(ret)) {
if (OB_FAIL(iter.next())) { if (OB_FAIL(iter.next())) {
CLOG_LOG(WARN, "next failed", K(id_)); CLOG_LOG(WARN, "next failed", K(id_), K(lsn));
} else if (OB_FAIL(iter.get_entry(entry, lsn))) { } else if (OB_FAIL(iter.get_entry(entry, lsn))) {
CLOG_LOG(WARN, "get entry failed", K(id_), K(entry)); CLOG_LOG(WARN, "get entry failed", K(id_), K(lsn), K(entry));
} else { } else {
int64_t pos = 0; int64_t header_pos = 0;
int64_t log_pos = 0;
const char *log_buf = entry.get_data_buf(); const char *log_buf = entry.get_data_buf();
const int64_t log_length = entry.get_data_len(); const int64_t log_length = entry.get_data_len();
logservice::ObLogBaseHeader header; logservice::ObLogBaseHeader header;
const int64_t header_size = header.get_serialize_size(); const int64_t header_size = header.get_serialize_size();
if (OB_FAIL(header.deserialize(log_buf, header_size, pos))) { if (OB_FAIL(header.deserialize(log_buf, header_size, header_pos))) {
CLOG_LOG(WARN, "ObLogBaseHeader deserialize failed", K(id_), K(entry)); CLOG_LOG(ERROR, "ObLogBaseHeader deserialize failed", K(id_), K(lsn), K(entry));
} else if (OB_UNLIKELY(pos >= log_length)) { } else if (OB_UNLIKELY(!header.is_valid())) {
ret = OB_INVALID_DATA;
CLOG_LOG(ERROR, "log base header not valid", K(id_), K(lsn), K(entry), K(header));
} else if (OB_UNLIKELY(header_pos >= log_length)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
CLOG_LOG(ERROR, "unexpected log pos", K(id_), K(pos), K(log_length), K(entry)); CLOG_LOG(ERROR, "unexpected log pos", K(id_), K(header_pos), K(log_length), K(entry));
} else if (logservice::GC_LS_LOG_BASE_TYPE == header.get_log_type()) { } else if (logservice::GC_LS_LOG_BASE_TYPE == header.get_log_type()) {
logservice::ObGCLSLog gc_log; logservice::ObGCLSLog gc_log;
if (OB_FAIL(gc_log.deserialize(log_buf, log_length, pos))) { if (OB_FAIL(gc_log.deserialize(log_buf, log_length, log_pos))) {
CLOG_LOG(WARN, "gc_log deserialize failed", K(id_), K(pos), K(log_length), K(entry)); CLOG_LOG(ERROR, "gc_log deserialize failed", K(id_), K(log_pos), K(log_length), K(entry));
} else if (logservice::ObGCLSLOGType::OFFLINE_LS == gc_log.get_log_type()) { } else if (logservice::ObGCLSLOGType::OFFLINE_LS == gc_log.get_log_type()) {
done = true; done = true;
CLOG_LOG(INFO, "offline_log exist", K(id_), K(gc_log), K(lsn), K(entry)); CLOG_LOG(INFO, "offline_log exist", K(id_), K(gc_log), K(lsn), K(entry));

1
src/share/ob_debug_sync_point.h
View File

@ -560,6 +560,7 @@ class ObString;
ACT(BEFORE_PROCESS_EVENT_TASK,)\ ACT(BEFORE_PROCESS_EVENT_TASK,)\
ACT(BEFORE_CHECK_LS_TRANSFER_SCN_FOR_STANDBY,)\ ACT(BEFORE_CHECK_LS_TRANSFER_SCN_FOR_STANDBY,)\
ACT(BEFORE_GET_CONFIG_VERSION_AND_TRANSFER_SCN,)\ ACT(BEFORE_GET_CONFIG_VERSION_AND_TRANSFER_SCN,)\
ACT(LS_GC_BEFORE_OFFLINE,)\
ACT(MAX_DEBUG_SYNC_POINT,) ACT(MAX_DEBUG_SYNC_POINT,)
DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF); DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF);