INN commit: branches/2.5 (3 files)
INN Commit
rra at isc.org
Sat Aug 9 10:32:07 UTC 2014
Date: Saturday, August 9, 2014 @ 03:32:07
Author: iulius
Revision: 9651
innwatch: no longer creates a child process for sleeping
innwatch creates a child process only for sleeping and then waits on
that process. The forked-off process is not killed by 'rc.news stop'
(only its parent is), and will only die after it's done sleeping.
If running under SMF on illumos/Solaris, this causes the service to
likely drop into maintenance state (since not all processes die within
timeout).
Thanks to Lauri Tirkkonen for the patch.
Modified:
branches/2.5/CONTRIBUTORS
branches/2.5/doc/pod/news.pod
branches/2.5/scripts/innwatch.in
---------------------+
CONTRIBUTORS | 2 +-
doc/pod/news.pod | 15 +++++++++++++++
scripts/innwatch.in | 3 ++-
3 files changed, 18 insertions(+), 2 deletions(-)
Modified: CONTRIBUTORS
===================================================================
--- CONTRIBUTORS 2014-08-09 10:30:37 UTC (rev 9650)
+++ CONTRIBUTORS 2014-08-09 10:32:07 UTC (rev 9651)
@@ -276,4 +276,4 @@
Edmund H. Ramm, Raphael Barrois, Bo Lindbergh, Matthias Meyser,
Dennis Preiser, Paolo Amoroso, Dennis Davis, River Tarnell, Jochen Schmitt,
Tim Fardell, Remco Rijnders, David Binderman, Tony Evans, Christian Garbs,
-Colin Watson
+Colin Watson, Lauri Tirkkonen
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2014-08-09 10:30:37 UTC (rev 9650)
+++ doc/pod/news.pod 2014-08-09 10:32:07 UTC (rev 9651)
@@ -1,3 +1,18 @@
+=head1 Changes in 2.5.5
+
+=over 2
+
+=item *
+
+B<innwatch> no longer creates a child process only for sleeping and then
+waits on that process. The forked-off process only died after it had
+done sleeping, which caused the INN service to drop into maintenance
+state when for instance running under SMF on illumos/Solaris (since
+not all processes die within timeout). Thanks to Lauri Tirkkonen for
+the patch.
+
+=back
+
=head1 Changes in 2.5.4
=over 2
Modified: scripts/innwatch.in
===================================================================
--- scripts/innwatch.in 2014-08-09 10:30:37 UTC (rev 9650)
+++ scripts/innwatch.in 2014-08-09 10:32:07 UTC (rev 9651)
@@ -126,7 +126,8 @@
NEXTSLEEP=1
HASEXITED=false
-while { sleep ${NEXTSLEEP} & wait; } ; : ; do
+while sleep ${NEXTSLEEP}
+do
NEXTSLEEP=${INNWATCHSLEEPTIME}
## If news.daily is running, idle: we don't want to change the
More information about the inn-committers
mailing list