Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv432
Modified Files:
merovingian.mx
Log Message:
Make Merovingian recognise mservers in maintenance mode.
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/merovingian.mx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- merovingian.mx 28 Aug 2007 11:29:20 -0000 1.30
+++ merovingian.mx 28 Aug 2007 19:32:19 -0000 1.31
@@ -239,6 +239,10 @@
fflush(stdout);
SABAOTHfreeStatus(&stats);
return;
+ case SABdbMaintenance:
+ fprintf(stderr, "database '%s' remains under
maintenance, not attempting to shut down\n", d->dbname);
+ SABAOTHfreeStatus(&stats);
+ return;
default:
fprintf(stderr, "unknown state: %d", stats->state);
SABAOTHfreeStatus(&stats);
@@ -277,6 +281,11 @@
fflush(stdout);
SABAOTHfreeStatus(&stats);
return;
+ case SABdbMaintenance:
+ fprintf(stderr, "database '%s' is under
maintenance, "
+ "we shouldn't have
killed it!\n", d->dbname);
+ SABAOTHfreeStatus(&stats);
+ return;
default:
fprintf(stderr, "unknown state: %d",
stats->state);
break;
@@ -351,15 +360,6 @@
static err
forkMserver(str database, sabdb** stats, dpair dp)
{
-#ifdef NATIVE_WIN32
- intptr_t rv = 0;
- /*rv = _spawnv(_P_DETACH, ...); FIXME */ (void) database;
- if (rv == -1) {
- /* forking failed somehow */
- return(newErr(strerror(errno)));
- }
- return(NO_ERR);
-#else
pid_t pid;
str er;
sabuplog info;
@@ -429,6 +429,9 @@
info.crashavg1, info.crashavg10,
info.crashavg30,
info.startcntr, info.stopcntr,
info.crashcntr);
break;
+ case SABdbMaintenance:
+ merlog("database '%s' is under maintenance", database);
+ break;
default:
SABAOTHfreeStatus(stats);
*stats = NULL;
@@ -531,6 +534,10 @@
return(newErr(
"database '%s'
appears to cleanly shut down "
"itself after
starting", database));
+ case SABdbMaintenance:
+ return(newErr(
+ "database '%s'
has been put into maintenance "
+ "mode during
startup", database));
default:
return(newErr("unknown state: %d",
(*stats)->state));
}
@@ -544,7 +551,6 @@
close(pfde[0]);
close(pfde[1]);
return(newErr(strerror(errno)));
-#endif
}
static err
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
