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

Fixed MM monitor segfault on crash.

Browse Source
This commit is contained in:
Markus Makela 2015-08-07 14:00:55 +03:00
parent a88a879572
commit ba32596603
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/gateway.c
View File

@ -1649,7 +1649,7 @@ int main(int argc, char **argv)
if(errno != EEXIST){
fprintf(stderr,
"Error: Cannot create data directory: %s\n",datadir);
"Error: Cannot create data directory '%s': %d %s\n",datadir,errno,strerror(errno));
goto return_main;
}
}
@ -1660,7 +1660,7 @@ int main(int argc, char **argv)
if(errno != EEXIST){
fprintf(stderr,
"Error: Cannot create data directory: %s\n",datadir);
"Error: Cannot create data directory '%s': %d %s\n",datadir,errno,strerror(errno));
goto return_main;
}
}

8
server/modules/monitor/mmmon.c
View File

@ -127,6 +127,7 @@ startMonitor(void *arg,void* opt)
handle->id = MONITOR_DEFAULT_ID;
handle->master = NULL;
handle->script = NULL;
handle->detectStaleMaster = false;
memset(handle->events,false,sizeof(handle->events));
spinlock_init(&handle->lock);
}
@ -198,7 +199,8 @@ startMonitor(void *arg,void* opt)
static void
stopMonitor(void *arg)
{
MM_MONITOR *handle = (MM_MONITOR *)arg;
MONITOR* mon = arg;
MM_MONITOR *handle = (MM_MONITOR *)mon->handle;
handle->shutdown = 1;
thread_wait((void *)handle->tid);
@ -564,8 +566,8 @@ monitorMain(void *arg)
MONITOR* mon = (MONITOR*)arg;
MM_MONITOR *handle;
MONITOR_SERVERS *ptr;
int detect_stale_master;
MONITOR_SERVERS *root_master;
int detect_stale_master = false;
MONITOR_SERVERS *root_master = NULL;
size_t nrounds = 0;
spinlock_acquire(&mon->lock);