Changeset: aed9c8c73268 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aed9c8c73268
Modified Files:
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
Branch: Oct2014
Log Message:
Add starting state to report functions.
This way when the state happens, it isn't reported as "unknown".
diffs (40 lines):
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -541,6 +541,13 @@ forkMserver(char *database, sabdb** stat
"itself down after
starting, "
"check monetdbd's
logfile for possible "
"hints", database));
+ case SABdbStarting:
+ return(newErr(
+ "database '%s' has
inconsistent state "
+ "(sabaoth
administration reports starting up, "
+ "but process seems
gone), "
+ "review monetdbd's "
+ "logfile for any
peculiarities", database));
default:
return(newErr("unknown state: %d",
(int)state));
}
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -294,6 +294,11 @@ terminateProcess(void *p)
msab_freeStatus(&stats);
free(dbname);
return;
+ case SABdbStarting:
+ Mfprintf(stderr, "database '%s' appears to be starting
up\n",
+ dbname);
+ /* starting up, so we'll go to the shut down phase */
+ break;
default:
Mfprintf(stderr, "unknown state: %d\n",
(int)stats->state);
msab_freeStatus(&stats);
@@ -332,6 +337,7 @@ terminateProcess(void *p)
} else {
switch (stats->state) {
case SABdbRunning:
+ case SABdbStarting:
/* ok, try again */
break;
case SABdbCrashed:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
