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

[kill -15][AFTER_DESTROY]fix destroy threads for kill -15

Browse Source
This commit is contained in:
zhjc1124
2023-07-11 06:54:20 +00:00
committed by ob-robot
parent ca5d9652c4
commit a543a1c63f
12 changed files with 142 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/observer/ob_server.cpp
View File

@ -478,6 +478,15 @@ void ObServer::destroy()
if (is_arbitration_mode()) {
} else if (!has_destroy_ && has_stopped_) {
FLOG_INFO("begin to destroy OB_LOGGER");
OB_LOGGER.destroy();
FLOG_INFO("OB_LOGGER destroyed");
FLOG_INFO("begin to destroy task controller");
ObTaskController::get().destroy();
FLOG_INFO("task controller destroyed");
FLOG_INFO("begin destroy signal worker");
sig_worker_->destroy();
FLOG_INFO("signal worker destroyed");
@ -676,6 +685,10 @@ void ObServer::destroy()
palf::election::GLOBAL_REPORT_TIMER.destroy();
FLOG_INFO("global election report timer destroyed");
FLOG_INFO("begin to destroy virtual tenant manager");
ObVirtualTenantManager::get_instance().destroy();
FLOG_INFO("virtual tenant manager destroyed");
FLOG_INFO("begin to destroy OB_PRIMARY_STANDBY_SERVICE");
OB_PRIMARY_STANDBY_SERVICE.destroy();
FLOG_INFO("OB_PRIMARY_STANDBY_SERVICE destroyed");
@ -684,6 +697,14 @@ void ObServer::destroy()
ROOTSERVICE_EVENT_INSTANCE.destroy();
FLOG_INFO("rootservice event history destroyed");
FLOG_INFO("begin to destroy kv global cache");
ObKVGlobalCache::get_instance().destroy();
FLOG_INFO("kv global cache destroyed");
FLOG_INFO("begin to destroy clock generator");
ObClockGenerator::destroy();
FLOG_INFO("clock generator destroyed");
has_destroy_ = true;
FLOG_INFO("[OBSERVER_NOTICE] destroy observer end");
@ -1022,6 +1043,14 @@ int ObServer::stop()
int fail_ret = OB_SUCCESS;
FLOG_INFO("[OBSERVER_NOTICE] stop observer begin");
FLOG_INFO("begin to stop OB_LOGGER");
OB_LOGGER.stop();
FLOG_INFO("stop OB_LOGGER success");
FLOG_INFO("begin to stop task controller");
ObTaskController::get().stop();
FLOG_INFO("stop task controller success");
FLOG_INFO("begin to stop config manager");
config_mgr_.stop();
FLOG_INFO("stop config manager success");
@ -1295,6 +1324,15 @@ int ObServer::stop()
FLOG_INFO("begin to stop global election report timer");
palf::election::GLOBAL_REPORT_TIMER.stop();
FLOG_INFO("global election report timer stopped");
FLOG_INFO("begin to stop kv global cache");
ObKVGlobalCache::get_instance().stop();
FLOG_INFO("kv global cache stopped");
FLOG_INFO("begin to stop clock generator");
ObClockGenerator::get_instance().stop();
FLOG_INFO("clock generator stopped");
}
has_stopped_ = true;
@ -1335,6 +1373,14 @@ int ObServer::wait()
if (is_arbitration_mode()) {
} else {
FLOG_INFO("begin to wait OB_LOGGER");
OB_LOGGER.wait();
FLOG_INFO("wait OB_LOGGER success");
FLOG_INFO("begin to wait task controller");
ObTaskController::get().wait();
FLOG_INFO("wait task controller success");
FLOG_INFO("begin wait signal worker");
sig_worker_->wait();
FLOG_INFO("wait signal worker success");
@ -1535,6 +1581,14 @@ int ObServer::wait()
ROOTSERVICE_EVENT_INSTANCE.wait();
FLOG_INFO("wait rootservice event history success");
FLOG_INFO("begin to wait kv global cache");
ObKVGlobalCache::get_instance().wait();
FLOG_INFO("wait kv global cache success");
FLOG_INFO("begin to wait clock generator");
ObClockGenerator::get_instance().wait();
FLOG_INFO("wait clock generator success");
gctx_.status_ = SS_STOPPED;
FLOG_INFO("[OBSERVER_NOTICE] wait observer end", KR(ret));
if (OB_SUCCESS != fail_ret) {