Merge branch 'develop' into MAX-324

This commit is contained in:
Markus Makela
2015-02-06 23:27:59 +02:00
25 changed files with 59552 additions and 959 deletions

View File

@ -220,6 +220,23 @@ int gw_read_backend_handshake(
"from backend. Error code: %d, Msg : %s",
errcode,
bufstr)));
/**
* If ER_HOST_IS_BLOCKED is found
* the related server is put in maintenace mode
* This will avoid filling the error log.
*/
if (errcode == 1129) {
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Server %s has been put into maintenance mode due to the server blocking connections from MaxScale. Run 'mysqladmin -h %s -P %d flush-hosts' on this server before taking this server out of maintenance mode.",
dcb->server->unique_name,
dcb->server->name,
dcb->server->port)));
server_set_status(dcb->server, SERVER_MAINT);
}
free(bufstr);
}