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

MXS-2218 Replace housekeeper task with delayed call

Browse Source
This commit is contained in:
Johan Wikman
2019-01-08 11:40:19 +02:00
parent c27a24ab37
commit e179395819
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/core/service.cc
View File

@ -40,7 +40,6 @@
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/dcb.hh> #include <maxscale/dcb.hh>
#include <maxscale/paths.h> #include <maxscale/paths.h>
#include <maxscale/housekeeper.h>
#include <maxscale/listener.hh> #include <maxscale/listener.hh>
#include <maxscale/poll.hh> #include <maxscale/poll.hh>
#include <maxscale/protocol.h> #include <maxscale/protocol.h>
@ -79,7 +78,7 @@ static struct
std::vector<Service*> services; std::vector<Service*> services;
} this_unit; } this_unit;
static bool service_internal_restart(void* data); static bool service_internal_restart(mxb::Worker::Call::action_t action, Service* service);
static void service_calculate_weights(SERVICE* service); static void service_calculate_weights(SERVICE* service);
Service* service_alloc(const char* name, const char* router, MXS_CONFIG_PARAMETER* params) Service* service_alloc(const char* name, const char* router, MXS_CONFIG_PARAMETER* params)
@ -357,19 +356,15 @@ int serviceStartAllPorts(Service* service)
{ {
/** Service failed to start any ports. Try again later. */ /** Service failed to start any ports. Try again later. */
service->stats.n_failed_starts++; service->stats.n_failed_starts++;
char taskname[strlen(service->name) + strlen("_start_retry_")
+ (int) ceil(log10(INT_MAX)) + 1];
int retry_after = MXS_MIN(service->stats.n_failed_starts * 10, service->max_retry_interval); int retry_after = MXS_MIN(service->stats.n_failed_starts * 10, service->max_retry_interval);
snprintf(taskname,
sizeof(taskname),
"%s_start_retry_%d",
service->name,
service->stats.n_failed_starts);
hktask_add(taskname, service_internal_restart, service, retry_after);
MXS_NOTICE("Failed to start service %s, retrying in %d seconds.", MXS_NOTICE("Failed to start service %s, retrying in %d seconds.",
service->name, service->name,
retry_after); retry_after);
mxb::Worker* worker = mxb::Worker::get_current();
mxb_assert(worker);
worker->delayed_call(retry_after * 1000, service_internal_restart, service);
/** This will prevent MaxScale from shutting down if service start is retried later */ /** This will prevent MaxScale from shutting down if service start is retried later */
listeners = 1; listeners = 1;
} }
@ -1279,15 +1274,12 @@ std::unique_ptr<ResultSet> serviceGetList()
* Function called by the housekeeper thread to retry starting of a service * Function called by the housekeeper thread to retry starting of a service
* @param data Service to restart * @param data Service to restart
*/ */
static bool service_internal_restart(void* data) static bool service_internal_restart(mxb::Worker::Call::action_t action, Service* service)
{
if (action == mxb::Worker::Call::EXECUTE)
{ {
auto func = [=]() {
Service* service = static_cast<Service*>(data);
serviceStartAllPorts(service); serviceStartAllPorts(service);
}; }
auto worker = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
worker->execute(func, nullptr, mxs::RoutingWorker::EXECUTE_AUTO);
return false; return false;
} }