
The admin thread now uses blocking IO. This is not optimal but it simplifies the code by some amount. Fixed option processing removing one extra character from key name. Use correct member variable when checking for the option map end.
194 lines
4.1 KiB
C++
194 lines
4.1 KiB
C++
/*
|
|
* Copyright (c) 2016 MariaDB Corporation Ab
|
|
*
|
|
* Use of this software is governed by the Business Source License included
|
|
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
|
|
*
|
|
* Change Date: 2019-07-01
|
|
*
|
|
* On the date above, in accordance with the Business Source License, use
|
|
* of this software will be governed by version 2 or later of the General
|
|
* Public License.
|
|
*/
|
|
|
|
#include <maxscale/cppdefs.hh>
|
|
|
|
#include <climits>
|
|
#include <new>
|
|
|
|
#include <maxscale/atomic.h>
|
|
#include <maxscale/debug.h>
|
|
#include <maxscale/thread.h>
|
|
#include <maxscale/utils.h>
|
|
|
|
#include "maxscale/admin.hh"
|
|
#include "maxscale/hk_heartbeat.h"
|
|
|
|
#define DEFAULT_ADMIN_HOST "127.0.0.1"
|
|
#define DEFAULT_ADMIN_PORT 8080
|
|
#define DEFAULT_ADMIN_AUTH HTTP_AUTH_NONE
|
|
|
|
static AdminListener* admin = NULL;
|
|
static THREAD admin_thread;
|
|
static THREAD timeout_thread;
|
|
|
|
// TODO: Read values from the configuration
|
|
static AdminConfig config = {DEFAULT_ADMIN_HOST, DEFAULT_ADMIN_PORT, DEFAULT_ADMIN_AUTH};
|
|
|
|
void admin_main(void* data)
|
|
{
|
|
AdminListener* admin = reinterpret_cast<AdminListener*>(data);
|
|
admin->start();
|
|
}
|
|
|
|
void timeout_main(void *data)
|
|
{
|
|
AdminListener* admin = reinterpret_cast<AdminListener*>(data);
|
|
admin->check_timeouts();
|
|
}
|
|
|
|
AdminConfig& mxs_admin_get_config()
|
|
{
|
|
return config;
|
|
}
|
|
|
|
bool mxs_admin_init()
|
|
{
|
|
ss_dassert(admin == NULL);
|
|
bool rval = false;
|
|
struct sockaddr_storage addr = {};
|
|
int sock = open_network_socket(MXS_SOCKET_LISTENER, &addr, config.host.c_str(), config.port);
|
|
|
|
if (sock > -1)
|
|
{
|
|
setblocking(sock);
|
|
|
|
if (listen(sock, INT_MAX) == 0)
|
|
{
|
|
admin = new (std::nothrow) AdminListener(sock);
|
|
|
|
if (admin)
|
|
{
|
|
if (thread_start(&admin_thread, admin_main, admin) &&
|
|
thread_start(&timeout_thread, timeout_main, admin))
|
|
{
|
|
rval = true;
|
|
}
|
|
else
|
|
{
|
|
admin->stop();
|
|
delete admin;
|
|
admin = NULL;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
MXS_OOM();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
MXS_ERROR("Failed to start listening on '[%s]:%u': %d, %s",
|
|
config.host.c_str(), config.port, errno, mxs_strerror(errno));
|
|
close(sock);
|
|
}
|
|
}
|
|
|
|
return rval;
|
|
}
|
|
|
|
void mxs_admin_shutdown()
|
|
{
|
|
if (admin)
|
|
{
|
|
admin->stop();
|
|
thread_wait(timeout_thread);
|
|
thread_wait(admin_thread);
|
|
delete admin;
|
|
admin = NULL;
|
|
}
|
|
}
|
|
|
|
AdminListener::AdminListener(int sock):
|
|
m_socket(sock),
|
|
m_active(1),
|
|
m_timeout(10)
|
|
{
|
|
}
|
|
|
|
AdminListener::~AdminListener()
|
|
{
|
|
close(m_socket);
|
|
}
|
|
|
|
void AdminListener::handle_clients()
|
|
{
|
|
AdminClient* client;
|
|
|
|
while ((client = accept_client()))
|
|
{
|
|
SAdminClient sclient(client);
|
|
ClientList::iterator it = m_clients.insert(m_clients.begin(), sclient);
|
|
sclient->process();
|
|
m_clients.erase(it);
|
|
}
|
|
}
|
|
|
|
void AdminListener::start()
|
|
{
|
|
while (atomic_read(&m_active))
|
|
{
|
|
MXS_EXCEPTION_GUARD(handle_clients());
|
|
}
|
|
}
|
|
|
|
void AdminListener::stop()
|
|
{
|
|
atomic_write(&m_active, 0);
|
|
}
|
|
|
|
AdminClient* AdminListener::accept_client()
|
|
{
|
|
AdminClient* rval = NULL;
|
|
struct sockaddr_storage addr = {};
|
|
socklen_t len = sizeof (addr);
|
|
int fd = accept(m_socket, (struct sockaddr*) &addr, &len);
|
|
|
|
if (fd > -1)
|
|
{
|
|
rval = new AdminClient(fd, addr, m_timeout);
|
|
}
|
|
else
|
|
{
|
|
MXS_ERROR("Failed to accept client: %d, %s\n", errno, mxs_strerror(errno));
|
|
}
|
|
|
|
return rval;
|
|
}
|
|
|
|
void AdminListener::handle_timeouts()
|
|
{
|
|
int64_t now = hkheartbeat;
|
|
|
|
for (ClientList::iterator it = m_clients.begin(); it != m_clients.end(); it++)
|
|
{
|
|
SAdminClient& client = *it;
|
|
|
|
if (now - client->last_activity() > m_timeout * 10)
|
|
{
|
|
client->close_connection();
|
|
}
|
|
}
|
|
|
|
/** Sleep for roughly one housekeeper heartbeat */
|
|
thread_millisleep(100);
|
|
}
|
|
|
|
void AdminListener::check_timeouts()
|
|
{
|
|
while (atomic_read(&m_active))
|
|
{
|
|
MXS_EXCEPTION_GUARD(handle_timeouts());
|
|
}
|
|
}
|