INN commit: trunk (5 files)

INN Commit Russ_Allbery at isc.org
Tue May 6 13:04:27 UTC 2008


    Date: Tuesday, May 6, 2008 @ 06:04:27
  Author: iulius
Revision: 7823

Change three inn.conf settings:

clienttimeout:       600 -> 1800
innwatchbatchspace:  800 -> 4000
innwatchspoolspace: 8000 -> 25000

Modified:
  trunk/doc/pod/inn.conf.pod
  trunk/lib/innconf.c
  trunk/samples/inn.conf.in
  trunk/samples/innwatch.ctl
  trunk/scripts/innwatch.in

----------------------+
 doc/pod/inn.conf.pod |    4 ++--
 lib/innconf.c        |    6 +++---
 samples/inn.conf.in  |    6 +++---
 samples/innwatch.ctl |   13 ++++++++-----
 scripts/innwatch.in  |   43 +++++++++++++++++++++----------------------
 5 files changed, 37 insertions(+), 35 deletions(-)

Modified: doc/pod/inn.conf.pod
===================================================================
--- doc/pod/inn.conf.pod	2008-05-05 21:30:08 UTC (rev 7822)
+++ doc/pod/inn.conf.pod	2008-05-06 13:04:27 UTC (rev 7823)
@@ -939,7 +939,7 @@
 
 Free space in I<pathoutgoing>, in inndf(8) output units (normally
 kilobytes), at which innd(8) will be throttled by innwatch(8), assuming a
-default F<innwatch.ctl>.  The default value is C<800>.
+default F<innwatch.ctl>.  The default value is C<4000>.
 
 =item I<innwatchlibspace>
 
@@ -982,7 +982,7 @@
 Free space in I<patharticles> and I<pathoverview>, in inndf(8) output
 units (normally kilobytes), at which innd(8) will be throttled by
 innwatch(8), assuming a default F<innwatch.ctl>.  The default value is
-C<8000>.
+C<25000>.
 
 =back
 

Modified: lib/innconf.c
===================================================================
--- lib/innconf.c	2008-05-05 21:30:08 UTC (rev 7822)
+++ lib/innconf.c	2008-05-06 13:04:27 UTC (rev 7823)
@@ -190,7 +190,7 @@
     { K(backoffpostslow),       NUMBER  (1) },
     { K(backofftrigger),        NUMBER  (10000) },
     { K(checkincludedtext),     BOOL    (false) },
-    { K(clienttimeout),         NUMBER  (600) },
+    { K(clienttimeout),         NUMBER  (1800) },
     { K(complaints),            STRING  (NULL) },
     { K(initialtimeout),        NUMBER  (10) },
     { K(keyartlimit),           NUMBER  (100000) },
@@ -248,14 +248,14 @@
 
     /* The following settings are specific to innwatch. */
     { K(doinnwatch),            BOOL    (true) },
-    { K(innwatchbatchspace),    NUMBER  (800) },
+    { K(innwatchbatchspace),    NUMBER  (4000) },
     { K(innwatchlibspace),      NUMBER  (25000) },
     { K(innwatchloload),        NUMBER  (1000) },
     { K(innwatchhiload),        NUMBER  (2000) },
     { K(innwatchpauseload),     NUMBER  (1500) },
     { K(innwatchsleeptime),     NUMBER  (600) },
     { K(innwatchspoolnodes),    NUMBER  (200) },
-    { K(innwatchspoolspace),    NUMBER  (8000) },
+    { K(innwatchspoolspace),    NUMBER  (25000) },
 
     /* The following settings are specific to scanlogs. */
     { K(logcycles),             NUMBER  (3) },

Modified: samples/inn.conf.in
===================================================================
--- samples/inn.conf.in	2008-05-05 21:30:08 UTC (rev 7822)
+++ samples/inn.conf.in	2008-05-06 13:04:27 UTC (rev 7823)
@@ -77,7 +77,7 @@
 
 allownewnews:           true
 articlemmap:            false
-clienttimeout:          600
+clienttimeout:          1800
 initialtimeout:         10
 msgidcachesize:         10000
 nfsreader:              false
@@ -135,14 +135,14 @@
 # Monitoring
 
 doinnwatch:             true
-innwatchbatchspace:     800
+innwatchbatchspace:     4000
 innwatchlibspace:       25000
 innwatchloload:         1000
 innwatchhiload:         2000
 innwatchpauseload:      1500
 innwatchsleeptime:      600
 innwatchspoolnodes:     200
-innwatchspoolspace:     8000
+innwatchspoolspace:     25000
 
 # Logging
 

Modified: samples/innwatch.ctl
===================================================================
--- samples/innwatch.ctl	2008-05-05 21:30:08 UTC (rev 7822)
+++ samples/innwatch.ctl	2008-05-06 13:04:27 UTC (rev 7823)
@@ -1,10 +1,12 @@
-##  $Revision$
-##  innwatch.ctl -- control file for innwatch.
+##  $Id$
+##
+##  Sample control file for innwatch.
+##
 ##  Indicates what to run to test the state of the news system, and what
 ##  to do about it.  Format:
 ##	!state!when!command!test!limit!command!reason/comment
 ##  where
-##	<!>		Delimiter; pick from [,:@;?!]
+##	<!>		Delimiter; pick from [,:@;?!].
 ##	<state>		State to enter if true.
 ##	<when>		States we must be in to match.
 ##	<command>	Command to run to test condition.
@@ -13,6 +15,8 @@
 ##	<command>	Command for innwatch to perform; use exit,
 ##			flush, go, pause, shutdown, skip, or throttle.
 ##	<reason>	Used in ctlinnd command (if needed).
+##
+##  See the innwatch.ctl man page for more information.
 
 ##  First, just exit innwatch if innd has gone away.
 !!! test -f ${LOCKS}/innd.pid && echo 0 || echo 1 ! eq ! 1 ! exit ! innd dead
@@ -25,12 +29,11 @@
 !load!load hiload! uptime | tr -d ,. | awk '{ print $(NF - 2) }' ! lt ! ${INNWATCHLOLOAD} ! go ! loadav
 !hiload!+ load! uptime | tr -d ,. | awk '{ print $(NF - 2) }' ! gt ! ${INNWATCHHILOAD} ! throttle ! loadav
 !load!+! uptime | tr -d ,. | awk '{ print $(NF - 2) }' ! gt ! ${INNWATCHPAUSELOAD} ! pause ! loadav
-##
+
 ## Uncomment these to keep overchan backlog in check.  Assumes your overchan
 ## feed is named 'overview!'.
 #::overblog:ctlinnd feedinfo overview!|awk 'NR==1{print $7}':lt:100000:go:overviewbacklog
 #:overblog:+:ctlinnd feedinfo overview!|awk 'NR==1{print $7}':gt:400000:throttle:overviewbacklog
-##
 
 ##  If load is OK, check space (and inodes) on various filesystems
 !!! ${INNDF} . ! lt ! ${INNWATCHSPOOLSPACE} ! throttle ! No space (spool)

Modified: scripts/innwatch.in
===================================================================
--- scripts/innwatch.in	2008-05-05 21:30:08 UTC (rev 7822)
+++ scripts/innwatch.in	2008-05-06 13:04:27 UTC (rev 7823)
@@ -1,18 +1,18 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision$
+##  $Id$
 ##  Watch the state of the system relative to the news subsystem.
 ##  As controlled by the control file, when space or inodes are almost
-##  exhausted innd is throttled, or paused, similarly if the load is
-##  too high - when conditions revert to normal, innd is restarted.
+##  exhausted, innd is throttled or paused, similarly if the load is
+##  too high; when conditions revert to normal, innd is restarted.
 ##  No logging is done here, watch for syslog reports from innd.
 ##  Written by Mike Cooper <mcooper at usc.edu>.
 ##  Extensively modified by <kre at munnari.oz.au>.
 ##  Watch a log file and send mail when it gets new output by
-##	Steve Groom <stevo at elroy.Jpl.Nasa.Gov>
+##	Steve Groom <stevo at elroy.Jpl.Nasa.Gov>.
 ##  Steve's extensions merged in innwatch by
-##	<Christophe.Wolfhugel at grasp.insa-lyon.fr>
+##	<Christophe.Wolfhugel at grasp.insa-lyon.fr>.
 
 PROGNAME=innwatch
 LOCK=${LOCKS}/LOCK.${PROGNAME}
@@ -20,15 +20,15 @@
 ##  Where to put the timestamp file (directory and filename).
 TIMESTAMP=${LOCKS}/${PROGNAME}.time
 
-##  Logfile to watch. Comment out if no logwatch.
+##  Logfile to watch.  Comment out if no logwatch.
 LOGFILE=${MOST_LOGS}/news.crit
 
-## Default value in case there is no definition in inn.conf
+##  Default value in case there is no definition in inn.conf.
 : ${INNWATCHPAUSELOAD:=1500}
 : ${INNWATCHHILOAD:=2000}
 : ${INNWATCHLOLOAD:=1000}
-: ${INNWATCHSPOOLSPACE:=8000}
-: ${INNWATCHBATCHSPACE:=800}
+: ${INNWATCHSPOOLSPACE:=25000}
+: ${INNWATCHBATCHSPACE:=4000}
 : ${INNWATCHLIBSPACE:=25000}
 : ${INNWATCHSPOOLNODES:=200}
 : ${INNWATCHSLEEPTIME:=600}
@@ -89,7 +89,7 @@
 trap 'rm -f ${LOCK} ${WATCHPID} ; exit 1' 1 3 15
 echo "$$" > ${WATCHPID}
 
-##  The reason why we turned INND off, and its, and our current state.
+##  The reason why we turned innd off, and its, and our current state.
 REASON=''
 INND=''
 STATE=''
@@ -99,8 +99,8 @@
 	date
     ) >${INNWSTATUS}' 2
 
-##  We need to remember the process ID of innd, in case one exits
-##  But we need to wait for innd to start before we can do that
+##  We need to remember the process ID of innd, in case one exits.
+##  But we need to wait for innd to start before we can do that.
 while PID=`cat ${SERVERPID} 2>/dev/null`; test -z "${PID}"; do
     sleep ${INNWATCHSLEEPTIME}
 done
@@ -134,8 +134,8 @@
     ##  have done.
     test -f "${DAILY}" && continue
 
-    ## Check to see if INND is running.
-    ## Notify NEWSMASTER if it has stopped or just restarted.
+    ##  Check to see if innd is running.
+    ##  Notify the newsmaster if it has stopped or just restarted.
     if ctlinnd -s -t 120 mode 2>/dev/null ; then
 	${HASEXITED} && {
 	    HASEXITED=false
@@ -150,8 +150,7 @@
     fi
 
     ##  If innd has exited & restarted, put the new one into the
-    ##  same state the old one was in
-
+    ##  same state the old one was in.
     nPID=`cat ${SERVERPID} 2>/dev/null`
     test -n "${nPID}" -a "${PID}" -ne "${nPID}" && {
 	test -n "${INND}" -a "${INND}" != go && ctlinnd -s "${INND}" "${REASON}"
@@ -170,7 +169,7 @@
 	test -z "$line" && continue
 
 	##  The first character on the line is the field delimiter,
-	##  except '#' which marks the line as a comment
+	##  except '#' which marks the line as a comment.
 	delim=`expr "${line}" : '\(.\).*'`
 	test "X${delim}" = 'X#' && continue
 
@@ -193,7 +192,7 @@
 
 	##  Should we act on this line?  We will if one (or more) of the
 	##  specified conditions is satisfied.
-	for X in a b; do	# meaningless trash because we have no goto
+	for X in a b; do	# Meaningless trash because we have no goto.
 	    if [ -z "${CND}" ]; then
 		X=-
 	    else
@@ -218,7 +217,7 @@
 		    test "X${STATE}" != "X${cnd}" && continue;
 		    ;;
 		esac
-		break 2;	# OK, continue with this line
+		break 2;	# OK, continue with this line.
 	    done
 	    continue 2;		# No, skip it.
 	done
@@ -281,7 +280,7 @@
 		ctlinnd -s "${CMD}" "${ARG}" && STATE="${O}" && INND="${CMD}"
 		break
 
-	    ##  Otherwise, if innd is not running, and reverse test succeeds
+	    ##  Otherwise, if innd is not running, and reverse test succeeds,
 	    ##  restart it.
 	    elif [ "${STATE}" = "${LAB}" -a \
 		    \( "${CMD}" = "throttle" -o "${CMD}" = pause \) -a \
@@ -307,8 +306,8 @@
 	if [ ! -f ${TIMESTAMP} ]; then
 	    DOIT=${LOGFILE}
 	else
-	    # use ls to print most recently modified file first.
-	    # If that's ${LOGFILE}, it's changed since the last pass.
+	    # Use ls to print most recently modified file first.
+	    # If that's ${LOGFILE}, it has changed since the last pass.
 	    DOIT="`ls -t ${TIMESTAMP} ${LOGFILE} | ${SED} -e 1q | grep ${LOGFILE}`"
 	fi
 



More information about the inn-committers mailing list