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

Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-19 00:15:21 +02:00
parent fd11e6a7f5 fc04087ab4
commit bb39267126
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,8 @@
* This means both IO and SQL threads are not working on slaves. * This means both IO and SQL threads are not working on slaves.
* This option is not enabled by default. * This option is not enabled by default.
* 10/11/14 Massimiliano Pinto Addition of setNetworkTimeout for connect, read, write * 10/11/14 Massimiliano Pinto Addition of setNetworkTimeout for connect, read, write
* 18/11/14 Massimiliano Pinto One server only in configuration becomes master.
* servers=server1 must be present in mysql_mon and in router sections as well.
* *
* @endverbatim * @endverbatim
*/ */
@ -694,8 +696,25 @@ size_t nrounds = 0;
ptr = ptr->next; ptr = ptr->next;
} }
ptr = handle->databases;
/* if only one server is configured, that's is Master */
if (num_servers == 1) {
if (SERVER_IS_RUNNING(ptr->server)) {
ptr->server->depth = 0;
/* status cleanup */
monitor_clear_pending_status(ptr, SERVER_SLAVE);
/* master status set */
monitor_set_pending_status(ptr, SERVER_MASTER);
ptr->server->depth = 0;
handle->master = ptr;
root_master = ptr;
}
} else {
/* Compute the replication tree */ /* Compute the replication tree */
root_master = get_replication_tree(handle, num_servers); root_master = get_replication_tree(handle, num_servers);
}
/* Update server status from monitor pending status on that server*/ /* Update server status from monitor pending status on that server*/
@ -714,6 +733,7 @@ size_t nrounds = 0;
ptr->server->status = ptr->pending_status; ptr->server->status = ptr->pending_status;
} }
} }
ptr = ptr->next; ptr = ptr->next;
} }