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

Fix persisted monitors not working

Browse Source 
This prevented persisted monitors from being deleted after a restart.
This commit is contained in:
Markus Mäkelä
2017-01-03 20:18:15 +02:00
parent 2a4714500f
commit 66430a3584
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/maxscale/config.h
View File

@ -102,6 +102,7 @@ typedef struct config_context
char *object; /**< The name of the object being configured */ char *object; /**< The name of the object being configured */
CONFIG_PARAMETER *parameters; /**< The list of parameter values */ CONFIG_PARAMETER *parameters; /**< The list of parameter values */
void *element; /**< The element created from the data */ void *element; /**< The element created from the data */
bool was_persisted; /**< True if this object was persisted */
struct config_context *next; /**< Next pointer in the linked list */ struct config_context *next; /**< Next pointer in the linked list */
} CONFIG_CONTEXT; } CONFIG_CONTEXT;

20
server/core/config.c
View File

@ -106,7 +106,7 @@ static const char *config_file = NULL;
static GATEWAY_CONF gateway; static GATEWAY_CONF gateway;
static FEEDBACK_CONF feedback; static FEEDBACK_CONF feedback;
char *version_string = NULL; char *version_string = NULL;
static bool is_persisted_config = false; /**< True if a persisted configuration file is being parsed */
static char *service_params[] = static char *service_params[] =
{ {
@ -330,6 +330,7 @@ CONFIG_CONTEXT* config_context_create(const char *section)
if (ctx) if (ctx)
{ {
ctx->object = MXS_STRDUP_A(section); ctx->object = MXS_STRDUP_A(section);
ctx->was_persisted = is_persisted_config;
ctx->parameters = NULL; ctx->parameters = NULL;
ctx->next = NULL; ctx->next = NULL;
ctx->element = NULL; ctx->element = NULL;
@ -649,6 +650,15 @@ config_load_and_process(const char* filename, bool (*process_config)(CONFIG_CONT
if (is_directory(persist_cnf) && contains_cnf_files(persist_cnf)) if (is_directory(persist_cnf) && contains_cnf_files(persist_cnf))
{ {
/**
* Set the global flag that we are processing a persisted configuration.
* This will tell the modules whether it is OK to completely overwrite
* the persisted configuration when changes are made.
*
* TODO: Figure out a cleaner way to do this
*/
is_persisted_config = true;
MXS_NOTICE("Loading generated configuration files from '%s'", persist_cnf); MXS_NOTICE("Loading generated configuration files from '%s'", persist_cnf);
DUPLICATE_CONTEXT p_dcontext; DUPLICATE_CONTEXT p_dcontext;
/** /**
@ -667,6 +677,7 @@ config_load_and_process(const char* filename, bool (*process_config)(CONFIG_CONT
{ {
rval = false; rval = false;
} }
is_persisted_config = false;
} }
if (rval) if (rval)
@ -2966,6 +2977,13 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
MXS_ERROR("Failed to create monitor '%s'.", obj->object); MXS_ERROR("Failed to create monitor '%s'.", obj->object);
error_count++; error_count++;
} }
if (obj->was_persisted)
{
/** Not the cleanest way of figuring out whether the configuration
* was stored but it should be OK for now */
((MONITOR*)obj->element)->created_online = true;
}
} }
else else
{ {