Changeset: eeb6a93397fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/eeb6a93397fb
Modified Files:
tools/merovingian/daemon/forkmserver.c
Branch: Jul2021
Log Message:
Changed error message for "impossible state".
diffs (29 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
@@ -348,14 +348,22 @@ forkMserver(const char *database, sabdb*
break;
default:
/* this also includes SABdbStarting, which we shouldn't ever
- * see due to the global starting lock */
+ * see due to the global starting lock
+ *
+ * if SABdbStarting: a process (presumably mserver5) has locked
+ * the database (i.e. the .gdk_lock file), but the server is not
+ * ready to accept connections (i.e. there is no .started
+ * file) */
state = (*stats)->state;
msab_freeStatus(stats);
freeConfFile(ckv);
free(ckv);
pthread_mutex_unlock(&dp->fork_lock);
- return(newErr("unknown or impossible state: %d",
- (int)state));
+ if (state == SABdbStarting)
+ return(newErr("unexpected state: database is locked but
not yet started"));
+ else
+ return(newErr("unknown or impossible state: %d",
+ (int)state));
}
/* create the pipes (filedescriptors) now, such that we and the
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
