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

Merge branch 'release-1.0GA' into testing_header

Browse Source
This commit is contained in:
Markus Makela 2015-01-05 14:46:34 +02:00
commit b99467cd63
7 changed files with 92 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
query_classifier/query_classifier.cc
View File

@ -174,8 +174,8 @@ bool parse_query (
data = (uint8_t*)GWBUF_DATA(querybuf);
len = MYSQL_GET_PACKET_LEN(data)-1; /*< distract 1 for packet type byte */
if (len < 1 || len >= SIZE_MAX - 1 || (query_str = (char *)malloc(len+1)) == NULL)
if (len < 1 || len >= ~((size_t)0) - 1 || (query_str = (char *)malloc(len+1)) == NULL)
{
/** Free parsing info data */
parsing_info_done(pi);

4
server/core/modutil.c
View File

@ -286,7 +286,7 @@ modutil_get_query(GWBUF *buf)
case MYSQL_COM_QUERY:
len = MYSQL_GET_PACKET_LEN(packet)-1; /*< distract 1 for packet type byte */
if (len < 1 || len > SIZE_MAX - 1 || (query_str = (char *)malloc(len+1)) == NULL)
if (len < 1 || len > ~(size_t)0 - 1 || (query_str = (char *)malloc(len+1)) == NULL)
{
goto retblock;
}
@ -296,7 +296,7 @@ modutil_get_query(GWBUF *buf)
default:
len = strlen(STRPACKETTYPE(packet_type))+1;
if (len < 1 || len > SIZE_MAX - 1 || (query_str = (char *)malloc(len+1)) == NULL)
if (len < 1 || len > ~(size_t)0 - 1 || (query_str = (char *)malloc(len+1)) == NULL)
{
goto retblock;
}

66
server/core/service.c
View File

@ -331,16 +331,22 @@ serviceStart(SERVICE *service)
{
SERV_PROTOCOL *port;
int listeners = 0;
if ((service->router_instance = service->router->createInstance(service,
service->routerOptions)) == NULL)
{
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
"%s: Failed to create router instance for service. Service not started.",
service->name)));
service->state = SERVICE_STATE_FAILED;
return 0;
}
if(service->router_instance == NULL)
{
/*
* This is the first time this service's router is being started or the
* previous attempt failed.
*/
if((service->router_instance = service->router->createInstance(service,
service->routerOptions)) == NULL)
{
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
"%s: Failed to create router instance for service. Service not started.",
service->name)));
service->state = SERVICE_STATE_FAILED;
return 0;
}
}
port = service->ports;
while (!service->svc_do_shutdown && port)
@ -353,7 +359,10 @@ int listeners = 0;
service->state = SERVICE_STATE_STARTED;
service->stats.started = time(0);
}
else
{
service->state = SERVICE_STATE_LISTENER_FAILED;
}
return listeners;
}
@ -408,6 +417,40 @@ int n = 0,i;
return n;
}
/**
* Try to start services that failed to start their listeners but successfully
* started their routers.
* @return Number of successfully started services
*/
int
serviceStartFailedListeners()
{
SERVICE *ptr;
int n = 0,i;
spinlock_acquire(&service_spin);
ptr = allServices;
spinlock_release(&service_spin);
while (ptr && !ptr->svc_do_shutdown)
{
if(ptr->state == SERVICE_STATE_LISTENER_FAILED)
{
n += (i = serviceStart(ptr));
if(i == 0)
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Failed to start service '%s'.",
ptr->name)));
}
}
ptr = ptr->next;
}
return n;
}
/**
* Stop a service
*
@ -815,7 +858,6 @@ SERVICE *service;
return service;
}
/**
* Print details of an individual service
*

1
server/include/server.h
View File

@ -130,6 +130,7 @@ typedef struct server {
(SERVER_RUNNING|SERVER_MASTER|SERVER_SLAVE|SERVER_MAINT)) == \
(SERVER_RUNNING|SERVER_MASTER))
#define SRV_DOWN_STATUS(status) ((status & SERVER_RUNNING) == 0)
/**
* Is the server valid candidate for root master. The server must be running,
* marked as master and not have maintenance bit set.

3
server/include/service.h
View File

@ -152,6 +152,8 @@ typedef enum count_spec_t {COUNT_NONE=0, COUNT_ATLEAST, COUNT_EXACT, COUNT_ATMOS
#define SERVICE_STATE_STARTED 2 /**< The service has been started */
#define SERVICE_STATE_FAILED 3 /**< The service failed to start */
#define SERVICE_STATE_STOPPED 4 /**< The service has been stopped */
#define SERVICE_STATE_LISTENER_FAILED 5 /**< The service successfully started the
router but failed to start the listeners*/
extern SERVICE *service_alloc(const char *, const char *);
extern int service_free(SERVICE *);
@ -165,6 +167,7 @@ extern void serviceAddRouterOption(SERVICE *, char *);
extern void serviceClearRouterOptions(SERVICE *);
extern int serviceStart(SERVICE *);
extern int serviceStartAll();
extern int serviceStartFailedListeners();
extern void serviceStartProtocol(SERVICE *, char *, int);
extern int serviceStop(SERVICE *);
extern int serviceRestart(SERVICE *);

28
server/modules/monitor/mysql_mon.c
View File

@ -64,6 +64,8 @@
#include <dcb.h>
#include <modinfo.h>
#include "service.h"
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
@ -610,7 +612,7 @@ int num_servers=0;
MONITOR_SERVERS *root_master = NULL;
size_t nrounds = 0;
int log_no_master = 1;
int new_backends = 0;
if (mysql_thread_init())
{
LOGIF(LE, (skygw_log_write_flush(
@ -648,7 +650,10 @@ int log_no_master = 1;
nrounds += 1;
/* reset num_servers */
num_servers = 0;
/* reset new_backends */
new_backends = 0;
/* start from the first server in the list */
ptr = handle->databases;
@ -691,7 +696,13 @@ int log_no_master = 1;
!(SERVER_IS_IN_CLUSTER(ptr->server)))
{
dcb_call_foreach(DCB_REASON_NOT_RESPONDING);
}
}
if(SRV_DOWN_STATUS(ptr->mon_prev_status) &&
SERVER_IS_RUNNING(ptr->server))
{
new_backends++;
}
}
if (mon_status_changed(ptr))
@ -726,6 +737,17 @@ int log_no_master = 1;
ptr = ptr->next;
}
/**
* Some new servers are now running. Try to start services
* that failed to start their listeners but successfully created
* their router instances.
*/
if(new_backends > 0)
{
serviceStartFailedListeners();
}
ptr = handle->databases;
/* if only one server is configured, that's is Master */

9
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -2235,7 +2235,7 @@ static bool route_single_stmt(
{
rlag_max = rses_get_max_replication_lag(rses);
}
btype = BE_UNDEFINED; /*< target may be master or slave */
btype = route_target & TARGET_SLAVE ? BE_SLAVE : BE_MASTER; /*< target may be master or slave */
/**
* Search backend server by name or replication lag.
* If it fails, then try to find valid slave or master.
@ -4684,15 +4684,16 @@ static bool have_enough_servers(
}
if (nservers < min_nsrv)
{
LOGIF(LE, (skygw_log_write_flush(
double dbgpct = ((double)min_nsrv/(double)router_nsrv)*100.0;
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Unable to start %s service. There are "
"too few backend servers configured in "
"MaxScale.cnf. Found %d%% when at least %d%% "
"MaxScale.cnf. Found %d%% when at least %.0f%% "
"would be required.",
router->service->name,
(*p_rses)->rses_config.rw_max_slave_conn_percent,
min_nsrv/(router_nsrv/100))));
dbgpct)));
}
}
free(*p_rses);