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

MXS-1929: Make services destroyable

Browse Source 
Services can now be destroyed if they have no active listeners and they
are not linked to servers. When these conditions are met, the service will
be destroyed when the last session for the service is closed.

The closing of a service will close all listeners that were once assigned
to the service. This allows closing of the ports at runtime which
previously was done only on shutdown.

Exposed the command through the REST API but not through MaxAdmin as it is
deprecated.
This commit is contained in:
Markus Mäkelä
2018-07-18 10:03:54 +03:00
parent 18c1ec2678
commit 5a40064826
7 changed files with 163 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/core/session.cc
View File

@ -44,6 +44,7 @@
#include "internal/filter.h"
#include "internal/routingworker.hh"
#include "internal/session.h"
#include "internal/service.h"
using std::string;
using std::stringstream;
@ -341,6 +342,23 @@ void session_close(MXS_SESSION *session)
}
}
class ServiceDestroyTask: public mxs::WorkerDisposableTask
{
public:
ServiceDestroyTask(SERVICE* service):
m_service(service)
{
}
void execute(Worker& worker) override
{
service_free(m_service);
}
private:
SERVICE* m_service;
};
/**
* Deallocate the specified session
*
@ -395,7 +413,13 @@ static void session_free(MXS_SESSION *session)
session->state = SESSION_STATE_FREE;
session_final_free(session);
atomic_add(&service->client_count, -1);
if (atomic_add(&service->client_count, -1) == 1 && !service->active)
{
// Destroy the service in the main routing worker thread
mxs::RoutingWorker* main_worker = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
main_worker->post(std::auto_ptr<ServiceDestroyTask>(new ServiceDestroyTask(service)));
}
}
static void