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

[kill -15][BEFORE_DESTROY]add stop and wait thread

Browse Source
This commit is contained in:
zhjc1124
2023-07-11 11:18:22 +00:00
committed by ob-robot
parent 47a0ba9293
commit 9e3fa0652d
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/observer/ob_server.cpp
View File

@ -661,6 +661,14 @@ void ObServer::destroy()
ObMdsEventBuffer::destroy();
FLOG_INFO("ObMdsEventBuffer destroyed");
FLOG_INFO("begin to wait destroy multi tenant");
multi_tenant_.destroy();
FLOG_INFO("wait destroy multi tenant success");
FLOG_INFO("begin to destroy safe destroy instance");
SAFE_DESTROY_INSTANCE.destroy();
FLOG_INFO("wait destroy safe destroy instance success");
FLOG_INFO("begin to destroy query retry ctrl");
ObQueryRetryCtrl::destroy();
FLOG_INFO("query retry ctrl destroy");
@ -1228,6 +1236,10 @@ int ObServer::stop()
bl_service_.stop();
FLOG_INFO("blacklist service stopped");
FLOG_INFO("begin to stop memory dump");
ObMemoryDump::get_instance().stop();
FLOG_INFO("memory dump stopped");
FLOG_INFO("begin to stop tenant timezone manager");
tenant_timezone_mgr_.stop();
FLOG_INFO("tenant timezone manager stopped");
@ -1474,18 +1486,11 @@ int ObServer::wait()
multi_tenant_.wait();
FLOG_INFO("wait multi tenant success");
FLOG_INFO("begin to wait destroy multi tenant");
multi_tenant_.destroy();
FLOG_INFO("wait destroy multi tenant success");
// safe to destroy
FLOG_INFO("begin to wait for safe destroy instance");
SAFE_DESTROY_INSTANCE.wait();
FLOG_INFO("wait for safe destroy instance success");
FLOG_INFO("begin to destroy safe destroy instance");
SAFE_DESTROY_INSTANCE.destroy();
FLOG_INFO("wait destroy safe destroy instance success");
FLOG_INFO("begin to wait ratelimit manager");
rl_mgr_.wait();
@ -1560,6 +1565,10 @@ int ObServer::wait()
bl_service_.wait();
FLOG_INFO("wait blacklist service success");
FLOG_INFO("begin to wait memory dump");
ObMemoryDump::get_instance().wait();
FLOG_INFO("wait memory dump success");
FLOG_INFO("begin to wait tenant timezone manager");
tenant_timezone_mgr_.wait();
FLOG_INFO("wait tenant timezone manager success");