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

MXS-836: Fix retry_on_failure not working

Browse Source 
The service start retry mechanism mistakenly returned an error when a
service failed to start but a retry was queued. This caused MaxScale to
stop whenever a service failed to start.
This commit is contained in:
Markus Makela
2016-09-06 15:05:34 +03:00
parent 3e08c248b9
commit fca09e0d7b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/config.c
View File

@ -135,6 +135,7 @@ static char *service_params[] =
"ignore_databases_regex", "ignore_databases_regex",
"log_auth_warnings", "log_auth_warnings",
"source", /**< Avrorouter only */ "source", /**< Avrorouter only */
"retry_on_failure",
NULL NULL
}; };

3
server/core/service.c
View File

@ -452,6 +452,9 @@ int serviceStartAllPorts(SERVICE* service)
(void*) service, retry_after); (void*) service, retry_after);
MXS_NOTICE("Failed to start service %s, retrying in %d seconds.", MXS_NOTICE("Failed to start service %s, retrying in %d seconds.",
service->name, retry_after); service->name, retry_after);
/** This will prevent MaxScale from shutting down if service start is retried later */
listeners = 1;
} }
} }
else else