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

[gc]destory of ls resource should consider parameter _delay_resource_recycle_after_correctness_issue

Browse Source
This commit is contained in:
obdev
2024-02-10 07:33:29 +00:00
committed by ob-robot
parent 45c403637d
commit 07fa49965f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/logservice/ob_garbage_collector.cpp
View File

@ -35,6 +35,7 @@
#include "rootserver/ob_tenant_info_loader.h" // ObTenantInfoLoader #include "rootserver/ob_tenant_info_loader.h" // ObTenantInfoLoader
#include "share/ob_occam_time_guard.h" #include "share/ob_occam_time_guard.h"
#include "storage/slog_ckpt/ob_server_checkpoint_slog_handler.h" #include "storage/slog_ckpt/ob_server_checkpoint_slog_handler.h"
#include "storage/concurrency_control/ob_data_validation_service.h"
namespace oceanbase namespace oceanbase
{ {
@ -788,6 +789,8 @@ void ObGCHandler::try_check_and_set_wait_gc_(ObGarbageCollector::LSStatus &ls_st
K(readable_scn), K(offline_scn), K(ls_id), K(gc_state)); K(readable_scn), K(offline_scn), K(ls_id), K(gc_state));
} else if (readable_scn < offline_scn) { } else if (readable_scn < offline_scn) {
CLOG_LOG(INFO, "try_check_and_set_wait_gc_ wait readable_scn", K(ret), K(ls_id), K(gc_state), K(offline_scn), K(readable_scn)); CLOG_LOG(INFO, "try_check_and_set_wait_gc_ wait readable_scn", K(ret), K(ls_id), K(gc_state), K(offline_scn), K(readable_scn));
} else if (concurrency_control::ObDataValidationService::need_delay_resource_recycle(ls_id)) {
CLOG_LOG(INFO, "need delay resource recycle", K(ls_id));
} else if (OB_FAIL(check_if_tenant_in_archive_(tenant_in_archive))) { } else if (OB_FAIL(check_if_tenant_in_archive_(tenant_in_archive))) {
CLOG_LOG(WARN, "check_if_tenant_in_archive_ failed", K(ret), K(ls_id), K(gc_state)); CLOG_LOG(WARN, "check_if_tenant_in_archive_ failed", K(ret), K(ls_id), K(gc_state));
} else if (! tenant_in_archive) { } else if (! tenant_in_archive) {

5
src/logservice/ob_garbage_collector.h
View File

@ -120,13 +120,10 @@ public:
ObGCLSLog(const int16_t log_type); ObGCLSLog(const int16_t log_type);
~ObGCLSLog(); ~ObGCLSLog();
public: public:
int64_t to_string(char* buf, const int64_t buf_len) const
{
return 0;
}
void reset(); void reset();
int16_t get_log_type(); int16_t get_log_type();
NEED_SERIALIZE_AND_DESERIALIZE; NEED_SERIALIZE_AND_DESERIALIZE;
TO_STRING_KV(K(header_), K(version_), K(log_type_));
private: private:
static const int16_t GC_LOG_VERSION = 1; static const int16_t GC_LOG_VERSION = 1;
ObLogBaseHeader header_; ObLogBaseHeader header_;