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

Completed merge, fixed print delay to simple one.

Browse Source
This commit is contained in:
VilhoRaatikka 2014-06-07 01:05:12 +03:00
parent ad744962b2
commit 916b763685
2 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,19 +307,6 @@ char *sep;
static void
monitorDatabase(MYSQL_MONITOR *handle, MONITOR_SERVERS *database)
{
<<<<<<< HEAD
MYSQL_ROW row;
MYSQL_RES *result;
int num_fields;
int ismaster = 0, isslave = 0;
char *uname = defaultUser, *passwd = defaultPasswd;
unsigned long int server_version = 0;
char *server_string;
static int conn_err_count;
static int modval = 10;
if (database->server->monuser != NULL)
=======
MYSQL_ROW row;
MYSQL_RES *result;
int num_fields;
@ -330,10 +317,8 @@ char *server_string;
unsigned long id = handle->id;
int replication_heartbeat = handle->replicationHeartbeat;
static int conn_err_count;
static int modval = 10;
if (database->server->monuser != NULL)
>>>>>>> develop
{
uname = database->server->monuser;
passwd = database->server->monpw;
@ -342,24 +327,17 @@ static int modval = 10;
if (uname == NULL)
return;
<<<<<<< HEAD
=======
/* Don't probe servers in maintenance mode */
if (SERVER_IN_MAINT(database->server))
return;
>>>>>>> develop
if (database->con == NULL || mysql_ping(database->con) != 0)
{
char *dpwd = decryptPassword(passwd);
int rc;
int read_timeout = 1;
<<<<<<< HEAD
database->con = mysql_init(NULL);
=======
database->con = mysql_init(NULL);
>>>>>>> develop
rc = mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout);
if (mysql_real_connect(database->con,
@ -371,8 +349,7 @@ static int modval = 10;
NULL,
0) == NULL)
{
<<<<<<< HEAD
if (conn_err_count%modval == 0)
if (conn_err_count%10 == 0)
{
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
@ -381,23 +358,8 @@ static int modval = 10;
database->server->name,
database->server->port,
mysql_error(database->con))));
conn_err_count = 0;
modval += 1;
}
else
{
conn_err_count += 1;
}
=======
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Monitor was unable to connect to "
"server %s:%d : \"%s\"",
database->server->name,
database->server->port,
mysql_error(database->con))));
>>>>>>> develop
conn_err_count += 1;
free(dpwd);
server_clear_status(database->server, SERVER_RUNNING);
@ -696,7 +658,6 @@ monitorMain(void *arg)
MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg;
MONITOR_SERVERS *ptr;
static int err_count;
static int modval = 10;
if (mysql_thread_init())
{
@ -721,18 +682,11 @@ static int modval = 10;
{
unsigned int prev_status = ptr->server->status;
<<<<<<< HEAD
monitorDatabase(ptr, handle->defaultUser, handle->defaultPasswd);
if (ptr->server->status != prev_status ||
(SERVER_IS_DOWN(ptr->server) &&
err_count%modval == 0))
=======
monitorDatabase(handle, ptr);
if (ptr->server->status != prev_status ||
SERVER_IS_DOWN(ptr->server))
>>>>>>> develop
(SERVER_IS_DOWN(ptr->server) &&
err_count%10 == 0))
{
LOGIF(LM, (skygw_log_write_flush(
LOGFILE_MESSAGE,
@ -740,18 +694,11 @@ static int modval = 10;
ptr->server->name,
ptr->server->port,
STRSRVSTATUS(ptr->server))));
<<<<<<< HEAD
err_count = 0;
modval += 1;
}
else if (SERVER_IS_DOWN(ptr->server))
if (SERVER_IS_DOWN(ptr->server))
{
err_count += 1;
}
=======
}
>>>>>>> develop
ptr = ptr->next;
}
thread_millisleep(handle->interval);

4
server/modules/protocol/mysql_client.c
View File

@ -795,7 +795,6 @@ int gw_read_client_event(DCB* dcb) {
/** Route COM_QUIT to backend */
if (mysql_command == '\x01') {
<<<<<<< HEAD
#if defined(ERRHANDLE)
/**
* Close router session and that closes
@ -806,9 +805,6 @@ int gw_read_client_event(DCB* dcb) {
#else
SESSION_ROUTE_QUERY(session, read_buffer);
// router->routeQuery(router_instance, rsession, read_buffer);
=======
SESSION_ROUTE_QUERY(session, read_buffer);
>>>>>>> develop
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"%lu [gw_read_client_event] Routed COM_QUIT to "