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

MXS-1705 Make note of workers only after creation

Browse Source 
The variable containing the number of workers must be updated
only after the workers have been successfully created.

Failure to do this led to crash in Worker::shutdown_all() if a
terminating signal was received after the worker initialization
had failed.
This commit is contained in:
Johan Wikman
2018-03-07 16:04:53 +02:00
parent 010c1b2625
commit 3e8f51bbf3
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/core/worker.cc
View File

@ -182,7 +182,6 @@ bool Worker::init()
{ {
ss_dassert(!this_unit.initialized); ss_dassert(!this_unit.initialized);
this_unit.n_workers = config_threadcount();
this_unit.number_poll_spins = config_nbpolls(); this_unit.number_poll_spins = config_nbpolls();
this_unit.max_poll_sleep = config_pollsleep(); this_unit.max_poll_sleep = config_pollsleep();
@ -190,33 +189,37 @@ bool Worker::init()
if (this_unit.epoll_listener_fd != -1) if (this_unit.epoll_listener_fd != -1)
{ {
this_unit.ppWorkers = new (std::nothrow) Worker* [this_unit.n_workers] (); // Zero initialized array int n_workers = config_threadcount();
Worker** ppWorkers = new (std::nothrow) Worker* [n_workers] (); // Zero initialized array
if (this_unit.ppWorkers) if (ppWorkers)
{ {
for (int i = 0; i < this_unit.n_workers; ++i) for (int i = 0; i < n_workers; ++i)
{ {
Worker* pWorker = Worker::create(i, this_unit.epoll_listener_fd); Worker* pWorker = Worker::create(i, this_unit.epoll_listener_fd);
if (pWorker) if (pWorker)
{ {
this_unit.ppWorkers[i] = pWorker; ppWorkers[i] = pWorker;
} }
else else
{ {
for (int j = i - 1; j >= 0; --j) for (int j = i - 1; j >= 0; --j)
{ {
delete this_unit.ppWorkers[j]; delete ppWorkers[j];
} }
delete this_unit.ppWorkers; delete [] ppWorkers;
this_unit.ppWorkers = NULL; ppWorkers = NULL;
break; break;
} }
} }
if (this_unit.ppWorkers) if (ppWorkers)
{ {
this_unit.ppWorkers = ppWorkers;
this_unit.n_workers = n_workers;
this_unit.initialized = true; this_unit.initialized = true;
} }
} }
@ -931,10 +934,12 @@ void Worker::shutdown()
void Worker::shutdown_all() void Worker::shutdown_all()
{ {
// NOTE: No logging here, this function must be signal safe. // NOTE: No logging here, this function must be signal safe.
ss_dassert((this_unit.n_workers == 0) || (this_unit.ppWorkers != NULL));
for (int i = 0; i < this_unit.n_workers; ++i) for (int i = 0; i < this_unit.n_workers; ++i)
{ {
Worker* pWorker = this_unit.ppWorkers[i]; Worker* pWorker = this_unit.ppWorkers[i];
ss_dassert(pWorker);
pWorker->shutdown(); pWorker->shutdown();
} }