Hello, 2011/9/20 Mathieu Parent <[email protected]>: > 2011/9/20 Adam D. Barratt <[email protected]>: >> On Tue, 2011-09-20 at 22:20 +0200, Mathieu Parent wrote: >>> While testing ctdb (1.0.112-12-2) with apache2 failover, I find that >>> the proposed patch was not good (92-apache-service-enable.diff from >>> http://release.debian.org/proposed-updates/stable_diffs/ctdb_1.0.112-12-2.debdiff). >>> >>> So, I propose another upload with the following diff from -2: >>> +Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=8317 >> [...] >>> This has been completely tested (aka, not only in sid) and fixes the >>> problem. >>> >>> Can I upload it? >> >> Apologies if I'm missing something, but your comment above implies that >> the newly proposed patch has been applied in unstable. However, >> checking the package from unstable only shows the patch already applied >> in -2. Please could you clarify? > > Of course. > > The patch in -2 is the same as in unstable. It depends on a patch > (http://git.samba.org/?p=ctdb.git;a=commitdiff_plain;h=d98f175e84, > only the "is_ctdb_managed_service" part of it is needed) that is in > testing and sid but not in squeeze. This patch adds an optional > argument to the is_ctdb_managed_service function that defaults to > $service_name (it does the same think as before the patch when no > param is provided). > > The patch in -3 workaround the lack of parameter in > is_ctdb_managed_service function, by adding "apache2" to the $t "kind > of" array when CTDB_MANAGES_HTTPD="yes". > > So the patch proposed in -3 is different from the one in sid but it > does the same thing, aka exiting the 41.httpd script unless > CTDB_MANAGES_HTTPD="yes". > > Is this OK? Or should I cheerypick patches from sid?
I have prepared the upload for solution "number 2". The diff with -2 is below : Index: debian/changelog =================================================================== --- debian/changelog (révision 3845) +++ debian/changelog (copie de travail) @@ -1,3 +1,11 @@ +ctdb (1.0.112-12-3) stable; urgency=low + + * Really fix httpd (i.e. apache2 service) activation + (the previous patch was depending on commit d98f175e which was not in ctdb + 1.0.112-12). + + -- Mathieu Parent <[email protected]> Wed, 21 Sep 2011 09:02:21 +0200 + ctdb (1.0.112-12-2) stable; urgency=low * Fix ethtool path in /etc/ctdb/events.d/10.interface (Closes: #635135) Index: debian/patches/92-apache-service-enable.diff =================================================================== --- debian/patches/92-apache-service-enable.diff (révision 3845) +++ debian/patches/92-apache-service-enable.diff (copie de travail) @@ -4,12 +4,36 @@ Author: Mathieu Parent <[email protected]> -Upstream status: to be sent +Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=8317 +Index: ctdb-1.0.112-12/config/functions +=================================================================== +--- ctdb-1.0.112-12.orig/config/functions 2011-09-21 08:56:39.000000000 +0200 ++++ ctdb-1.0.112-12/config/functions 2011-09-21 09:00:04.000000000 +0200 +@@ -539,6 +539,8 @@ + + is_ctdb_managed_service () + { ++ _service_name="${1:-${service_name}}" ++ + t=" $CTDB_MANAGED_SERVICES " + + ctdb_compat_managed_service "$CTDB_MANAGES_VSFTPD" "vsftpd" +@@ -550,8 +552,8 @@ + ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD" "clamd" + ctdb_compat_managed_service "$CTDB_MANAGES_NFS" "nfs" + +- # Returns 0 if "<space>$service_name<space>" appears in $t +- [ "${t#* ${service_name} }" != "${t}" ] ++ # Returns 0 if "<space>$_service_name<space>" appears in $t ++ [ "${t#* ${_service_name} }" != "${t}" ] + } + + ctdb_start_stop_service () Index: ctdb-1.0.112-12/config/events.d/41.httpd =================================================================== ---- ctdb-1.0.112-12.orig/config/events.d/41.httpd 2011-07-22 23:59:47.000000000 +0200 -+++ ctdb-1.0.112-12/config/events.d/41.httpd 2011-07-23 00:00:09.000000000 +0200 +--- ctdb-1.0.112-12.orig/config/events.d/41.httpd 2011-09-21 08:56:54.000000000 +0200 ++++ ctdb-1.0.112-12/config/events.d/41.httpd 2011-09-21 08:57:24.000000000 +0200 @@ -35,7 +35,7 @@ ctdb_start_stop_service Regards Mathieu Parent -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/cafx5sbwkwquhe+7fq0mtlvhckjgqp6fu2m+ip0tjngp1qyq...@mail.gmail.com
