From d9203e2b94b1551b4bd005a2fdf79e8d5f46c28c Mon Sep 17 00:00:00 2001 From: zhjc1124 Date: Wed, 21 Aug 2024 07:18:52 +0000 Subject: [PATCH] add check_tg_id_leak case --- deps/oblib/src/lib/thread/thread_define.h | 7 +- .../logservice/env/ob_simple_log_server.cpp | 2 +- .../palf_cluster/env/ob_simple_log_server.cpp | 2 +- .../ob_sql_plan_monitor_node_list.cpp | 2 +- src/share/ob_thread_define.h | 69 ++++++++++--------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/deps/oblib/src/lib/thread/thread_define.h b/deps/oblib/src/lib/thread/thread_define.h index aa3cb4533d..e56984a938 100644 --- a/deps/oblib/src/lib/thread/thread_define.h +++ b/deps/oblib/src/lib/thread/thread_define.h @@ -19,12 +19,11 @@ TG_DEF(TEST3, test3, DEDUP_QUEUE, 1, 8, 8, 16L << 20, 16L << 20,8192, "test") TG_DEF(TEST4, test4, THREAD_POOL, 1) TG_DEF(TEST5, test5, ASYNC_TASK_QUEUE, 1, 16) TG_DEF(TEST6, test6, MAP_QUEUE_THREAD, 2) -TG_DEF(TEST7, test7, QUEUE_THREAD, 10, 10) +// TG_DEF(TEST7, test7, QUEUE_THREAD, 10, 10) TG_DEF(TEST8, test8, REENTRANT_THREAD_POOL, 1) // other TG_DEF(MEMORY_DUMP, memDump, THREAD_POOL, 1) -TG_DEF(SchemaRefTask, SchemaRefTask, DEDUP_QUEUE, 1, 1024, 1024, 1L << 30, 512L << 20, common::OB_MALLOC_BIG_BLOCK_SIZE, "SchemaDedupQueu") -TG_DEF(ReqMemEvict, ReqMemEvict, TIMER) -TG_DEF(replica_control, replica_control, THREAD_POOL, 1) +// TG_DEF(SchemaRefTask, SchemaRefTask, DEDUP_QUEUE, 1, 1024, 1024, 1L << 30, 512L << 20, common::OB_MALLOC_BIG_BLOCK_SIZE, "SchemaDedupQueu") +// TG_DEF(replica_control, replica_control, THREAD_POOL, 1) TG_DEF(SYSLOG_COMPRESS, SyslogCompress, THREAD_POOL, 1) #endif diff --git a/mittest/logservice/env/ob_simple_log_server.cpp b/mittest/logservice/env/ob_simple_log_server.cpp index f8295d66fa..abf8f06962 100644 --- a/mittest/logservice/env/ob_simple_log_server.cpp +++ b/mittest/logservice/env/ob_simple_log_server.cpp @@ -644,7 +644,7 @@ int ObLogDeliver::init(const common::ObAddr &self, const bool is_bootstrap) // init_all_propocessor_(); if (is_bootstrap && OB_FAIL(ObMittestBlacklist::init(self))) { SERVER_LOG(WARN, "ObMittestBlacklist init failed", K(ret)); - } else if (OB_FAIL(TG_CREATE_TENANT(lib::TGDefIDs::TEST7, tg_id_))) { + } else if (OB_FAIL(TG_CREATE_TENANT(lib::TGDefIDs::COMMON_QUEUE_THREAD, tg_id_))) { SERVER_LOG(WARN, "ObSimpleThreadPool::init failed", K(ret)); } else { is_inited_ = true; diff --git a/mittest/palf_cluster/env/ob_simple_log_server.cpp b/mittest/palf_cluster/env/ob_simple_log_server.cpp index bedc7d6e4e..294009ccd7 100644 --- a/mittest/palf_cluster/env/ob_simple_log_server.cpp +++ b/mittest/palf_cluster/env/ob_simple_log_server.cpp @@ -417,7 +417,7 @@ int ObLogDeliver::init() } else if (false == blacklist_.created()) { SERVER_LOG(WARN, "blacklist_ created failed"); } else if (OB_FAIL(create_queue_thread(lib::TGDefIDs::LogServerTest, "LogServerQue", req_queue_))) { - } else if (OB_FAIL(TG_CREATE_TENANT(lib::TGDefIDs::TEST7, tg_id_))) { + } else if (OB_FAIL(TG_CREATE_TENANT(lib::TGDefIDs::COMMON_QUEUE_THREAD, tg_id_))) { SERVER_LOG(WARN, "ObSimpleThreadPool::init failed", K(ret)); } else { is_inited_ = true; diff --git a/src/share/diagnosis/ob_sql_plan_monitor_node_list.cpp b/src/share/diagnosis/ob_sql_plan_monitor_node_list.cpp index 27d9363f56..3a4a697ff6 100644 --- a/src/share/diagnosis/ob_sql_plan_monitor_node_list.cpp +++ b/src/share/diagnosis/ob_sql_plan_monitor_node_list.cpp @@ -13,7 +13,7 @@ #define USING_LOG_PREFIX SHARE #include "share/diagnosis/ob_sql_plan_monitor_node_list.h" #include "lib/rc/ob_rc.h" -#include "lib/thread/thread_mgr.h" +#include "share/ob_thread_mgr.h" using namespace oceanbase::common; using namespace oceanbase::sql; diff --git a/src/share/ob_thread_define.h b/src/share/ob_thread_define.h index c23a374ace..883883c03a 100755 --- a/src/share/ob_thread_define.h +++ b/src/share/ob_thread_define.h @@ -19,18 +19,18 @@ TG_DEF(COMMON_THREAD_POOL, ComTh, THREAD_POOL, 1) TG_DEF(COMMON_QUEUE_THREAD, ComQueueTh, QUEUE_THREAD, 1, 100) TG_DEF(COMMON_TIMER_THREAD, ComTimerTh, TIMER) TG_DEF(Blacklist, Blacklist, THREAD_POOL, 1) -TG_DEF(PartSerMigRetryQt, PartSerMigRetryQt, THREAD_POOL, 1) +// TG_DEF(PartSerMigRetryQt, PartSerMigRetryQt, THREAD_POOL, 1) // TG_DEF(PartSerCb, PartSerCb, QUEUE_THREAD, ThreadCountPair(storage::ObCallbackQueueThread::QUEUE_THREAD_NUM, storage::ObCallbackQueueThread::MINI_MODE_QUEUE_THREAD_NUM), // (!lib::is_mini_mode() ? OB_MAX_PARTITION_NUM_PER_SERVER : OB_MINI_MODE_MAX_PARTITION_NUM_PER_SERVER) * 2) // TG_DEF(PartSerLargeCb, PartSerLargeCb, QUEUE_THREAD, ThreadCountPair(storage::ObCallbackQueueThread::QUEUE_THREAD_NUM, storage::ObCallbackQueueThread::MINI_MODE_QUEUE_THREAD_NUM), // (!lib::is_mini_mode() ? OB_MAX_PARTITION_NUM_PER_SERVER : OB_MINI_MODE_MAX_PARTITION_NUM_PER_SERVER) * 2) // TG_DEF(ReplayEngine, ReplayEngine, QUEUE_THREAD, ThreadCountPair(sysconf(_SC_NPROCESSORS_ONLN), 2), // !lib::is_mini_mode() ? (common::REPLAY_TASK_QUEUE_SIZE + 1) * OB_MAX_PARTITION_NUM_PER_SERVER : (common::REPLAY_TASK_QUEUE_SIZE + 1) * OB_MINI_MODE_MAX_PARTITION_NUM_PER_SERVER) -TG_DEF(TransMigrate, TransMigrate, QUEUE_THREAD, ThreadCountPair(GET_THREAD_NUM_BY_NPROCESSORS(24), 1), 10000) +// TG_DEF(TransMigrate, TransMigrate, QUEUE_THREAD, ThreadCountPair(GET_THREAD_NUM_BY_NPROCESSORS(24), 1), 10000) TG_DEF(StandbyTimestampService, StandbyTimestampService, THREAD_POOL, 1) TG_DEF(TSnapSvc, TSnapSvc, THREAD_POOL, 1) TG_DEF(WeakReadService, WeakRdSrv, THREAD_POOL, 1) -TG_DEF(TransTaskWork, TransTaskWork, QUEUE_THREAD, ThreadCountPair(GET_THREAD_NUM_BY_NPROCESSORS(12), 1), transaction::ObThreadLocalTransCtx::MAX_BIG_TRANS_TASK) +// TG_DEF(TransTaskWork, TransTaskWork, QUEUE_THREAD, ThreadCountPair(GET_THREAD_NUM_BY_NPROCESSORS(12), 1), transaction::ObThreadLocalTransCtx::MAX_BIG_TRANS_TASK) TG_DEF(DDLTaskExecutor3, DDLTaskExecutor3, THREAD_POOL, ThreadCountPair(8, 2)) TG_DEF(TSWorker, TSWorker, QUEUE_THREAD, ThreadCountPair(GET_THREAD_NUM_BY_NPROCESSORS(12), 1), transaction::ObTsWorker::MAX_TASK_NUM) TG_DEF(BRPC, BRPC, THREAD_POOL, ThreadCountPair(obrpc::ObBatchRpc::MAX_THREAD_COUNT, obrpc::ObBatchRpc::MINI_MODE_THREAD_COUNT)) @@ -44,12 +44,12 @@ TG_DEF(DdlBuild, DdlBuild, ASYNC_TASK_QUEUE, ThreadCountPair(16, 1), 4 << 10) TG_DEF(LSService, LSService, REENTRANT_THREAD_POOL, 2) TG_DEF(ObCreateStandbyFromNetActor, ObCreateStandbyFromNetActor, REENTRANT_THREAD_POOL, 1) TG_DEF(SimpleLSService, SimpleLSService, REENTRANT_THREAD_POOL, 1) -TG_DEF(IntermResGC, IntermResGC, TIMER) +// TG_DEF(IntermResGC, IntermResGC, TIMER) TG_DEF(ServerGTimer, ServerGTimer, TIMER) TG_DEF(FreezeTimer, FreezeTimer, TIMER) TG_DEF(SqlMemTimer, SqlMemTimer, TIMER) TG_DEF(ServerTracerTimer, ServerTracerTimer, TIMER) -TG_DEF(RSqlPool, RSqlPool, TIMER) +// TG_DEF(RSqlPool, RSqlPool, TIMER) TG_DEF(KVCacheWash, KVCacheWash, TIMER) TG_DEF(KVCacheRep, KVCacheRep, TIMER) TG_DEF(ObHeartbeat, ObHeartbeat, TIMER) @@ -61,40 +61,40 @@ TG_DEF(MergeLoop, MergeLoop, TIMER) TG_DEF(SSTableGC, SSTableGC, TIMER) TG_DEF(MediumLoop, MediumLoop, TIMER) TG_DEF(CompactionRefresh, CompactionRefresh, TIMER) -TG_DEF(MinorScan, MinorScan, TIMER) -TG_DEF(MajorScan, MajorScan, TIMER) +// TG_DEF(MinorScan, MinorScan, TIMER) +// TG_DEF(MajorScan, MajorScan, TIMER) TG_DEF(WriteCkpt, WriteCkpt, TIMER) -TG_DEF(EXTLogWash, EXTLogWash, TIMER) -TG_DEF(LineCache, LineCache, TIMER) +// TG_DEF(EXTLogWash, EXTLogWash, TIMER) +// TG_DEF(LineCache, LineCache, TIMER) TG_DEF(LocalityReload, LocalityReload, TIMER) -TG_DEF(MemstoreGC, MemstoreGC, TIMER) +// TG_DEF(MemstoreGC, MemstoreGC, TIMER) TG_DEF(DiskUseReport, DiskUseReport, TIMER) -TG_DEF(CLOGReqMinor, CLOGReqMinor, TIMER) -TG_DEF(PGArchiveLog, PGArchiveLog, TIMER) -TG_DEF(CKPTLogRep, CKPTLogRep, TIMER) -TG_DEF(RebuildRetry, RebuildRetry, TIMER) -TG_DEF(TableMgrGC, TableMgrGC, TIMER) -TG_DEF(IndexSche, IndexSche, TIMER) +// TG_DEF(CLOGReqMinor, CLOGReqMinor, TIMER) +// TG_DEF(PGArchiveLog, PGArchiveLog, TIMER) +// TG_DEF(CKPTLogRep, CKPTLogRep, TIMER) +// TG_DEF(RebuildRetry, RebuildRetry, TIMER) +// TG_DEF(TableMgrGC, TableMgrGC, TIMER) +// TG_DEF(IndexSche, IndexSche, TIMER) TG_DEF(FreInfoReload, FreInfoReload, TIMER) -TG_DEF(HAGtsMgr, HAGtsMgr, TIMER) -TG_DEF(HAGtsHB, HAGtsHB, TIMER) -TG_DEF(RebuildTask, RebuildTask, TIMER) -TG_DEF(LogDiskMon, LogDiskMon, TIMER) -TG_DEF(ILOGFlush, ILOGFlush, TIMER) -TG_DEF(ILOGPurge, ILOGPurge, TIMER) -TG_DEF(RLogClrCache, RLogClrCache, TIMER) +// TG_DEF(HAGtsMgr, HAGtsMgr, TIMER) +// TG_DEF(HAGtsHB, HAGtsHB, TIMER) +// TG_DEF(RebuildTask, RebuildTask, TIMER) +// TG_DEF(LogDiskMon, LogDiskMon, TIMER) +// TG_DEF(ILOGFlush, ILOGFlush, TIMER) +// TG_DEF(ILOGPurge, ILOGPurge, TIMER) +// TG_DEF(RLogClrCache, RLogClrCache, TIMER) TG_DEF(TableStatRpt, TableStatRpt, TIMER) -TG_DEF(MacroMetaMgr, MacroMetaMgr, TIMER) -TG_DEF(StoreFileGC, StoreFileGC, TIMER) -TG_DEF(LeaseHB, LeaseHB, TIMER) -TG_DEF(ClusterTimer, ClusterTimer, TIMER) -TG_DEF(MergeTimer, MergeTimer, TIMER) -TG_DEF(CFC, CFC, TIMER) -TG_DEF(CCDF, CCDF, TIMER) +// TG_DEF(MacroMetaMgr, MacroMetaMgr, TIMER) +// TG_DEF(StoreFileGC, StoreFileGC, TIMER) +// TG_DEF(LeaseHB, LeaseHB, TIMER) +// TG_DEF(ClusterTimer, ClusterTimer, TIMER) +// TG_DEF(MergeTimer, MergeTimer, TIMER) +// TG_DEF(CFC, CFC, TIMER) +// TG_DEF(CCDF, CCDF, TIMER) TG_DEF(LogMysqlPool, LogMysqlPool, TIMER) TG_DEF(TblCliSqlPool, TblCliSqlPool, TIMER) -TG_DEF(QueryExecCtxGC, QueryExecCtxGC, THREAD_POOL, 1) -TG_DEF(DtlDfc, DtlDfc, TIMER) +// TG_DEF(QueryExecCtxGC, QueryExecCtxGC, THREAD_POOL, 1) +// TG_DEF(DtlDfc, DtlDfc, TIMER) TG_DEF(LogIOTaskCbThreadPool, LogIOCb, QUEUE_THREAD, ThreadCountPair(palf::LogIOTaskCbThreadPool::THREAD_NUM, palf::LogIOTaskCbThreadPool::MINI_MODE_THREAD_NUM), @@ -125,6 +125,7 @@ TG_DEF(RCService, RCSrv, QUEUE_THREAD, TG_DEF(ApplyService, ApplySrv, QUEUE_THREAD, 1, (common::APPLY_TASK_QUEUE_SIZE + 1) * OB_MAX_LS_NUM_PER_TENANT_PER_SERVER_CAN_BE_SET) TG_DEF(GlobalCtxTimer, GlobalCtxTimer, TIMER) TG_DEF(StorageLogWriter, StorageLogWriter, THREAD_POOL, 1) +TG_DEF(ReqMemEvict, ReqMemEvict, TIMER) TG_DEF(ReplayProcessStat, ReplayProcessStat, TIMER) TG_DEF(ActiveSessHist, ActiveSessHist, TIMER) TG_DEF(CTASCleanUpTimer, CTASCleanUpTimer, TIMER) @@ -159,8 +160,8 @@ TG_DEF(IO_HEALTH, IO_HEALTH, QUEUE_THREAD, 1, 100) TG_DEF(IO_BENCHMARK, IO_BENCHMARK, THREAD_POOL, 1) TG_DEF(TIMEZONE_MGR, TimezoneMgr, TIMER) TG_DEF(MASTER_KEY_MGR, MasterKeyMgr, QUEUE_THREAD, 1, 100) -TG_DEF(SRS_MGR, SrsMgr, TIMER, 128) -TG_DEF(InfoPoolResize, InfoPoolResize, TIMER) +// TG_DEF(SRS_MGR, SrsMgr, TIMER, 128) +// TG_DEF(InfoPoolResize, InfoPoolResize, TIMER) TG_DEF(TenantTransferService, TransferSrv, REENTRANT_THREAD_POOL, ThreadCountPair(4 ,1)) TG_DEF(WR_TIMER_THREAD, WrTimer, TIMER)