Merge ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-groovy into ubuntu/+source/apache2:ubuntu/groovy-devel

Proposed by Bryce Harrington
Status: Merged
Approved by: Bryce Harrington
Approved revision: 5b03b0873f8a139acdcdcf0704ea6558eba28785
Merge reported by: Christian Ehrhardt 
Merged at revision: 5b03b0873f8a139acdcdcf0704ea6558eba28785
Proposed branch: ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-groovy
Merge into: ubuntu/+source/apache2:ubuntu/groovy-devel
Diff against target: 98 lines (+40/-18)
2 files modified
debian/apache2ctl (+30/-18)
debian/changelog (+10/-0)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  Approve
Ubuntu Server Dev import team Pending
Canonical Server Team Pending
Review via email: mp+393680@code.launchpad.net

Description of the change

Backport to groovy of fix from
https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/393426

The start command was updated to work with systemd earlier; this extends the same fix for the 'graceful' command.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1832182
SRU: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1832182
Forwarded to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

As reference, that old fix for start was at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852543 in pkg/import/2.4.25-3

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

I remember reviewing the same fix for another release.
This one still LGTM and makes sense to avoid the direct restart breaking status detection.

Also changelog and version are ok.

The only thing I didn't get to this time is testing, have you run your PPA through upgrade tests already?

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Actually on the SRU I have one more thought.
A formerly "silent" action like the graceful restart does now emit messages:

  echo "Invoking 'systemctl restart ${APACHE_SYSTEMD_SERVICE}'."
  echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."

I agree this is good going forward and also good for "humans" to understand what might happen.
But on an SRU context I'm slightly more concerned people might grep output or such.
I don't have a much better idea yet, maybe pushing the messages to the log (less obvious to be seen, but less potential disruption)?
What do you think?

review: Needs Information
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks for the review.

It's a fair point that in an SRU context that changes to output are effectively behavioral changes. However, I'm not sure it's worth worrying about since a) this affects just the 'graceful' command which had been a bit broken to begin with (thus the bug), and b) the new output is consistent with the output from the 'start' command. People who had been avoiding 'graceful' due to the misbehavior likely will already be dealing with the status output from the 'start' command so if due to this fix they start using graceful they may find the lack of status output weird.

That said, I do find it a bit odd that the start command outputs to stdout rather than stderr, but this seems semi-consistent with similar code. Other places in the code do emit to stderr and I don't know if this is intentional or a discrepancy. In any case, I wanted to make this a minimal fix so am keeping similar to existing code style and not fixing up inconsistencies in the rest of the script, tho I am quite tempted... Maybe someday.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Yeah, I'm ok with the argument of keeping it "the same" as start for Bionic->Groovy, thanks for the thoughts and discussion.

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

Sounds good, I've tagged, pushed, and uploaded this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/apache2ctl b/debian/apache2ctl
index 404b9f9..1358f2a 100755
--- a/debian/apache2ctl
+++ b/debian/apache2ctl
@@ -143,6 +143,18 @@ mkdir_chown () {
143 fi143 fi
144}144}
145145
146need_systemd () {
147 # Detect if systemd is in use and should be used for managing
148 # the Apache2 httpd service. Returns 0 if so, 1 otherwise.
149 if [ -z "${APACHE_STARTED_BY_SYSTEMD}" ]; then
150 case "$(readlink -f /proc/1/exe)" in
151 *systemd*)
152 return 0
153 ;;
154 esac
155 fi
156 return 1
157}
146158
147[ ! -d ${APACHE_RUN_DIR:-/var/run/apache2} ] && mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}159[ ! -d ${APACHE_RUN_DIR:-/var/run/apache2} ] && mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
148[ ! -d ${APACHE_LOCK_DIR:-/var/lock/apache2} ] && mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}160[ ! -d ${APACHE_LOCK_DIR:-/var/lock/apache2} ] && mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
@@ -153,38 +165,38 @@ start)
153 # (this is bad if there are several apache2 instances running)165 # (this is bad if there are several apache2 instances running)
154 rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*166 rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
155167
156 need_systemd=false168 if need_systemd; then
157 if [ -z "$APACHE_STARTED_BY_SYSTEMD" ] ; then
158 case "$(readlink -f /proc/1/exe)" in
159 *systemd*)
160 need_systemd=true
161 ;;
162 *)
163 ;;
164 esac
165 fi
166 if $need_systemd ; then
167 # If running on systemd we should not start httpd without systemd169 # If running on systemd we should not start httpd without systemd
168 # or systemd will get confused about the status of httpd.170 # or systemd will get confused about the status of httpd.
169 echo "Invoking 'systemctl start $APACHE_SYSTEMD_SERVICE'."171 echo "Invoking 'systemctl start ${APACHE_SYSTEMD_SERVICE}'."
170 echo "Use 'systemctl status $APACHE_SYSTEMD_SERVICE' for more info."172 echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
171 systemctl start "$APACHE_SYSTEMD_SERVICE"173 systemctl start "${APACHE_SYSTEMD_SERVICE}"
172 else174 else
173 unset APACHE_STARTED_BY_SYSTEMD175 unset APACHE_STARTED_BY_SYSTEMD
174 $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"176 ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
175 fi177 fi
176178
177 ERROR=$?179 ERROR=$?
178 ;;180 ;;
179stop|graceful-stop)181stop|graceful-stop)
180 $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"182 ${HTTPD} ${APACHE_ARGUMENTS} -k "$ARGV"
181 ERROR=$?183 ERROR=$?
182 ;;184 ;;
183restart|graceful)185restart|graceful)
184 if $HTTPD ${APACHE_ARGUMENTS} -t 2> /dev/null ; then186 if $HTTPD ${APACHE_ARGUMENTS} -t 2> /dev/null ; then
185 $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"187 if need_systemd; then
188 # If running on systemd we should not directly restart httpd since
189 # systemd would be confused about httpd's status.
190 # (See LP: #1832182)
191 echo "Invoking 'systemctl restart ${APACHE_SYSTEMD_SERVICE}'."
192 echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
193 systemctl restart "${APACHE_SYSTEMD_SERVICE}"
194 else
195 unset APACHE_STARTED_BY_SYSTEMD
196 ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
197 fi
186 else198 else
187 $HTTPD ${APACHE_ARGUMENTS} -t199 ${HTTPD} ${APACHE_ARGUMENTS} -t
188 fi200 fi
189 ERROR=$?201 ERROR=$?
190 ;;202 ;;
diff --git a/debian/changelog b/debian/changelog
index 6295e4e..517a355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
1apache2 (2.4.46-1ubuntu1.1) groovy; urgency=medium
2
3 * d/apache2ctl: Also use systemd for graceful if it is in use.
4 (LP: #1832182)
5 - This extends an earlier fix for the start command to behave
6 similarly for restart / graceful. Fixes service failures on
7 unattended upgrade.
8
9 -- Bryce Harrington <bryce@canonical.com> Fri, 13 Nov 2020 01:36:38 +0000
10
1apache2 (2.4.46-1ubuntu1) groovy; urgency=medium11apache2 (2.4.46-1ubuntu1) groovy; urgency=medium
212
3 * Merge with Debian unstable. Remaining changes:13 * Merge with Debian unstable. Remaining changes:

Subscribers

People subscribed via source and target branches