Update of /cvsroot/monetdb/MonetDB5/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22749/conf
Modified Files:
Tag: GDK-2
Makefile.ag monetdb5.conf.in
Log Message:
propagated changes of Tuesday Aug 28 2007 - Monday Sep 03 2007
from the development trunk to the GDK-2 branch
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/Makefile.ag,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile.ag 16 Jul 2007 21:54:52 -0000 1.6
+++ Makefile.ag 3 Sep 2007 13:08:04 -0000 1.6.2.1
@@ -24,3 +24,6 @@
DIR = sysconfdir
SOURCES = monetdb5.conf
}
+
+monetdb_var_logdir = $(localstatedir)/log
+monetdb_var_log_DATA =
Index: monetdb5.conf.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/conf/monetdb5.conf.in,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- monetdb5.conf.in 23 Jul 2007 10:49:54 -0000 1.16
+++ monetdb5.conf.in 3 Sep 2007 13:08:04 -0000 1.16.2.1
@@ -23,9 +23,9 @@
[EMAIL PROTECTED]@@DIRSEP@@PACKAGE@@[EMAIL PROTECTED]
# MonetDB can only handle one database at a time. You can specify
-# the name of the database to use below. Note that you can use
-# multiple databases, but that you have to edit the database name
-# and restart MonetDB.
+# the name of the default database to use below.
+# Often, though, you should use the command line option
+# to specify the database of interest explicitly.
gdk_dbname=demo # default database to open
# The options below deal with various aspects of memory usage behaviour.
@@ -57,29 +57,47 @@
gdk_debug=0
# possible values: (can be a combination of)
# 1 = thread-specific debug output
-# 2 = property enforcing on new BATs
-# 4 = memory allocation
-# 8 = property checking on all values: tells about wrongly set properties
-# 16 = major IO activity
-# 32 = BAT handling
-# 64 = MIL parser debugging
-# 128 = Thread management
-# 256 = Event management
-# 512 = Transaction management
-# 1024 = Locks and Triggers
-# 2048 = Dynamic loading
-# 4096 = BBP Performance (?)
-# 8192 = Delta debugging (?)
-# 16384 = Module loading
-# 32768 = Yacc specific error messages
-# 65536 = tcpip (??)
-# 131072 = monet_multiplex: setaggr debugging (??)
-# 262144 = \
-# 524288 = ddbench (???)
-# 1048576 = /
-# 2097152 = show join/select algorithm chosen
-# 4194304 = show result size estimations (for join,select)
-# 8388608 = extended property checking: tells also about not set properties
+# 2 = CHECKMASK = property enforcing on new BATs
+# 4 = MEMMASK = memory allocation
+# 8 = PROPMASK = property checking on all values: tells about
+# wrongly set properties
+# 16 = IOMASK = major IO activity
+# 32 = BATMASK = BAT handling
+# 64 = PARSEMASK = parser debugging
+# 128 = PARMASK = Thread management
+# 256 = TRGMASK = Event management
+# 512 = TMMASK = Transaction management
+# 1024 = TEMMASK = Locks and Triggers
+# 2048 = DLMASK = Dynamic loading
+# 4096 = PERFMASK = BBP Performance (?)
+# 8192 = DELTAMASK = Delta debugging (?)
+# 16384 = LOADMASK = Module loading
+# 32768 = YACCMASK = Yacc specific error messages
+# 65536 = obsolete = tcpip (??)
+# 131072 = obsolete = monet_multiplex: setaggr debugging (??)
+# 262144 = obsolete = \
+# 524288 = obsolete = ddbench (???)
+# 1048576 = obsolete = /
+# 2097152 = ALGOMASK = show join/select algorithm chosen
+# 4194304 = ESTIMASK = show result size estimations (for join,select)
+# 8388608 = XPROPMASK = extended property checking: tells also about
+# not set properties
+#16777216 = JOINPROPMASK = disable property checking with join & outerjoin
+# (e.g., for performance measurements)
+#33554432 = DEADBEEFMASK = disable "cleaning" of freed memory in GDKfree()
+# (e.g., for performance measurements)
+#
+# Mserver 5 recognizes a series of command line names instead:
+# --threads ( 1 | PARMASK)
+# --memory (MEMMASK )
+# --properties (CHECKMASK | PROPMASK | BATMASK )
+# --io (IOMASK | PERFMASK )
+# --transactions ( TMMASK | DELTAMASK | TEMMASK)
+# --modules (DLMASK | LOADMASK)
+# --algorithms (ALGOMASK | ESTIMASK)
+# --xproperties (XPROPMASK )
+# --performance (JOINPROPMASK | DEADBEEFMASK)
+
# Monet Section
#==============
@@ -100,12 +118,6 @@
# If you leave this unset, some default key is used.
[EMAIL PROTECTED]@@[EMAIL PROTECTED]
-# Mguardian section
-#====================================
-delay=120 #waiting between pinging the server
-# if the guardian process is running, it will automatically
-# restart the server upon failuer and sent an email to the owner
-
# Merovingian section
#====================================
# Merovingian logs messages and errors by default to the stdout and
@@ -114,8 +126,8 @@
# to a file instead. It is legitimate to have both mero_msglog and
# mero_errlog pointing to the same file, as in the default below.
# Unsetting below defaults will make merovingian log to the screen.
[EMAIL PROTECTED]@/var/log/merovingian.log
[EMAIL PROTECTED]@/var/log/merovingian.log
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@@[EMAIL PROTECTED]@[EMAIL PROTECTED]
#
# Log messages may not be instantly logged, because the process that
# writes the message does not flush its buffered stream. Since
@@ -131,8 +143,8 @@
# 10 minutes.
mero_timeinterval=600
#
-# mservers that were started by Merovingian are not shut down when the
-# Merovingian is shut down. This behaviour might be undesirable if the
+# mservers that were started by Merovingian are shut down when the
+# Merovingian is shut down. This behaviour is desirable if the
# Merovingian is ran as daemon process that represents MonetDB, such as
# in an init.d script. Setting the time-out value below to a positive
# non-zero value will shut down each mserver that was started with a
@@ -140,7 +152,8 @@
# killed using the SIGKILL signal. A time-out value of 0 means that no
# mserver is shut down, meaning they will live on after the Merovingian
# has shut down. The default is to shut down all started mservers with
-# a time-out of 7 seconds.
+# a time-out of 7 seconds. Note that databases under maintenance are
+# never shut down by Merovingian, regardless this setting.
mero_exittimeout=7
# MAL section
-------------------------------------------------------------------------
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
