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

MXS-2218 Centralize worker shutdown handling

Browse Source
This commit is contained in:
Johan Wikman 2019-01-08 14:39:26 +02:00
parent 29b6e53eb8
commit 5a698be45c
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/maxscale/mainworker.hh
View File

@ -36,7 +36,16 @@ public:
~MainWorker();
/**
* Return the main worker.
* Does the main worker exist. It is only at startup and shutdown that this
* function may return false. When MaxScale is running normally, it will
* always return true.
*
* @return True, if the main worker has been created, false otherwise.
*/
static bool created();
/**
* Returns the main worker.
*
* @return The main worker.
*/

16
server/core/gateway.cc
View File

@ -151,7 +151,6 @@ static bool log_to_shm_configured = false;
static volatile sig_atomic_t last_signal = 0;
static bool unload_modules_at_exit = true;
static std::string redirect_output_to;
static maxscale::MainWorker* main_worker = nullptr;
static int cnf_preparser(void* data, const char* section, const char* name, const char* value);
static int write_pid_file(); /* write MaxScale pidfile */
@ -353,11 +352,6 @@ static void sigterm_handler(int i)
if (n_shutdowns == 1)
{
if (main_worker)
{
main_worker->shutdown();
}
if (!daemon_mode)
{
if (write(STDERR_FILENO, shutdown_msg, sizeof(shutdown_msg) - 1) == -1)
@ -379,11 +373,6 @@ static void sigint_handler(int i)
if (n_shutdowns == 1)
{
if (main_worker)
{
main_worker->shutdown();
}
if (!daemon_mode)
{
if (write(STDERR_FILENO, shutdown_msg, sizeof(shutdown_msg) - 1) == -1)
@ -1422,6 +1411,7 @@ int main(int argc, char** argv)
mxb::Worker* worker;
const char* specified_user = NULL;
char export_cnf[PATH_MAX + 1] = "";
maxscale::MainWorker* main_worker = nullptr;
/**
* The following lambda function is executed as the first event on the main worker. This is what starts
@ -1441,9 +1431,7 @@ int main(int argc, char** argv)
const char* logerr = "Failed to start all MaxScale services. Exiting.";
print_log_n_stderr(true, true, logerr, logerr, 0);
rc = MAXSCALE_NOSERVICES;
RoutingWorker::shutdown_all();
mxb_assert(main_worker);
main_worker->shutdown();
maxscale_shutdown();
}
else if (daemon_mode)
{

6
server/core/mainworker.cc
View File

@ -45,6 +45,12 @@ MainWorker::~MainWorker()
this_unit.pCurrent_main = nullptr;
}
//static
bool MainWorker::created()
{
return this_unit.pCurrent_main ? true : false;
}
//static
MainWorker& MainWorker::get()
{

6
server/core/misc.cc
View File

@ -15,6 +15,7 @@
#include <time.h>
#include <maxscale/mainworker.hh>
#include <maxscale/routingworker.hh>
#include "internal/maxscale.hh"
@ -50,6 +51,11 @@ int maxscale_shutdown()
if (n == 0)
{
if (mxs::MainWorker::created())
{
mxs::MainWorker::get().shutdown();
}
mxs::RoutingWorker::shutdown_all();
}