[25336] in Source-Commits
/svn/athena r24910 - trunk/debathena/config/zephyr-config/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri Dec 3 19:39:52 2010
Date: Fri, 3 Dec 2010 19:39:45 -0500
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201012040039.oB40djWp021970@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2010-12-03 19:39:45 -0500 (Fri, 03 Dec 2010)
New Revision: 24910
Modified:
trunk/debathena/config/zephyr-config/debian/changelog
trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up
Log:
In zephyr-config:
* In the if-up.d script, restart instead of start, as the zhm
initscript passes -N (don't send an HM_BOOT flushing subscriptions)
on the restart command. This works around losing subscriptions if
you manage to start multiple zhms (which is possible due to a Zephyr
3 bug involving SO_REUSEADDR) by the initscript and if-up.d script
racing; see discussion around Trac #133. Upstream will fix the
actual bug allowing multiple zhms to run.
We should possibly actually do as Trac #133 says and kill off the
initscript entirely in this package, possibly by replacing it with
an Upstart job that starts on runlevel or network, or alternatively
let upstream do so eventually, but this fixes the immediate issue.
Modified: trunk/debathena/config/zephyr-config/debian/changelog
===================================================================
--- trunk/debathena/config/zephyr-config/debian/changelog 2010-11-27 05:36:52 UTC (rev 24909)
+++ trunk/debathena/config/zephyr-config/debian/changelog 2010-12-04 00:39:45 UTC (rev 24910)
@@ -1,3 +1,20 @@
+debathena-zephyr-config (1.10) unstable; urgency=low
+
+ * In the if-up.d script, restart instead of start, as the zhm
+ initscript passes -N (don't send an HM_BOOT flushing subscriptions)
+ on the restart command. This works around losing subscriptions if
+ you manage to start multiple zhms (which is possible due to a Zephyr
+ 3 bug involving SO_REUSEADDR) by the initscript and if-up.d script
+ racing; see discussion around Trac #133. Upstream will fix the
+ actual bug allowing multiple zhms to run.
+
+ We should possibly actually do as Trac #133 says and kill off the
+ initscript entirely in this package, possibly by replacing it with
+ an Upstart job that starts on runlevel or network, or alternatively
+ let upstream do so eventually, but this fixes the immediate issue.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Fri, 03 Dec 2010 19:18:09 -0500
+
debathena-zephyr-config (1.9.2) unstable; urgency=low
* Ensure that zephyr-clients and libzephyr-krb5 stay in sync (Trac #586)
Modified: trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up
===================================================================
--- trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up 2010-11-27 05:36:52 UTC (rev 24909)
+++ trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.if-up 2010-12-04 00:39:45 UTC (rev 24910)
@@ -2,6 +2,6 @@
case "$ADDRFAM" in
inet|NetworkManager)
- /etc/init.d/zhm start >/dev/null 2>&1 || :
+ /etc/init.d/zhm restart >/dev/null 2>&1 || :
;;
esac
