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

Fix #2 to bug 680: http://bugs.mariadb.com/show_bug.cgi?id=680"

Browse Source 
When no users are loaded from backends, instead of counting it as a failure the service is started and the next time a client connects an attempt to load the users from the backends is made.
This commit is contained in:
Markus Makela
2015-01-05 17:38:45 +02:00
parent 9717190b4a
commit cd99849581
4 changed files with 15 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,8 +64,6 @@
#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[];
@ -612,7 +610,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(
@ -650,10 +648,7 @@ int new_backends = 0;
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;
@ -696,13 +691,7 @@ int new_backends = 0;
!(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))
@ -737,17 +726,6 @@ int new_backends = 0;
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 */