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

Fix monitor error with empty servers_no_promotion

Browse Source
This commit is contained in:
Esa Korhonen
2018-02-07 16:03:56 +02:00
parent 14a4008c84
commit fa8f6a5da3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/monitor.cc
View File

@ -2447,7 +2447,7 @@ int mon_config_get_servers(const MXS_CONFIG_PARAMETER* params, const char* key,
ss_dassert(*monitored_servers_out == NULL); ss_dassert(*monitored_servers_out == NULL);
SERVER** servers = NULL; SERVER** servers = NULL;
int servers_size = config_get_server_list(params, key, &servers); int servers_size = config_get_server_list(params, key, &servers);
int rval = -1; int rval = 0;
// All servers in the array must be monitored by the given monitor. // All servers in the array must be monitored by the given monitor.
if (servers_size > 0) if (servers_size > 0)
{ {
@ -2472,6 +2472,7 @@ int mon_config_get_servers(const MXS_CONFIG_PARAMETER* params, const char* key,
if (error) if (error)
{ {
MXS_FREE(monitored_array); MXS_FREE(monitored_array);
rval = -1;
} }
else else
{ {