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

Proposed by Bryce Harrington
Status: Rejected
Rejected by: Bryce Harrington
Proposed branch: ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-groovy
Merge into: ubuntu/+source/apache2:ubuntu/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  Needs Fixing
Ubuntu Server Developers Pending
Canonical Server Team Pending
Review via email: mp+391856@code.launchpad.net

Description of the change

Fix for a server-next Apache2 bug. The objective is to SRU this to all past LTS releases, so please review with that intent in mind.

The bug description for LP: #1832182 is prepped for the SRU, so I likewise would appreciate a detailed review of that text.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1832182/

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

SRU Template - LGTM
Changelog - LGTM

Actual change:
- ack to move the systemd check to a function

I needed some time for "APACHE_STARTED_BY_SYSTEMD".
That is set in the environment by the .service files.
So I assume if APACHE_STARTED_BY_SYSTEMD isn't set we probe (the new function).
But if it is set, then we exit 1 which means "no need for systemd"

is that
a) to unbreak loops where we start this from systemd, starting systemd, starting systemd, ...
   Then it makes sense but I wanted to ask ito be sure
b) wrong and should actually "exit 0" if APACHE_STARTED_BY_SYSTEMD is set?

Further in the change there is some whitespace damage with the "exit" calls not using spaces but tabs.

If you could fix the latter and explain the former then this should be fine to go.

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

Any updates on that ? it clutters my "active reviews" page :-P

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

Sorry, yeah I realized from your review that my original implementation was totally borked so have recoded it entirely. I noticed another corner case where the service state could get forgotten, so thought I should do some broader testing before reproposing the MP. Unfortunately, the past couple weeks were heavily side-tracked with other higher urgencies, but this (and php-parser) are back at the top of the stack so hope to have the MP up tomorrow or Monday.

Revision history for this message
Bryce Harrington (bryce) wrote :
5b03b08... by Bryce Harrington

changelog

Unmerged commits

5b03b08... by Bryce Harrington

changelog

37b368f... by Bryce Harrington

* d/apache2ctl: Also use systemd for graceful if it is in use. (LP: #1832182) - This extends an earlier fix for the start command to behave similarly for restart / graceful. Fixes service failures on unattended upgrade.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/apache2ctl b/debian/apache2ctl
2index 404b9f9..1358f2a 100755
3--- a/debian/apache2ctl
4+++ b/debian/apache2ctl
5@@ -143,6 +143,18 @@ mkdir_chown () {
6 fi
7 }
8
9+need_systemd () {
10+ # Detect if systemd is in use and should be used for managing
11+ # the Apache2 httpd service. Returns 0 if so, 1 otherwise.
12+ if [ -z "${APACHE_STARTED_BY_SYSTEMD}" ]; then
13+ case "$(readlink -f /proc/1/exe)" in
14+ *systemd*)
15+ return 0
16+ ;;
17+ esac
18+ fi
19+ return 1
20+}
21
22 [ ! -d ${APACHE_RUN_DIR:-/var/run/apache2} ] && mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
23 [ ! -d ${APACHE_LOCK_DIR:-/var/lock/apache2} ] && mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
24@@ -153,38 +165,38 @@ start)
25 # (this is bad if there are several apache2 instances running)
26 rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
27
28- need_systemd=false
29- if [ -z "$APACHE_STARTED_BY_SYSTEMD" ] ; then
30- case "$(readlink -f /proc/1/exe)" in
31- *systemd*)
32- need_systemd=true
33- ;;
34- *)
35- ;;
36- esac
37- fi
38- if $need_systemd ; then
39+ if need_systemd; then
40 # If running on systemd we should not start httpd without systemd
41 # or systemd will get confused about the status of httpd.
42- echo "Invoking 'systemctl start $APACHE_SYSTEMD_SERVICE'."
43- echo "Use 'systemctl status $APACHE_SYSTEMD_SERVICE' for more info."
44- systemctl start "$APACHE_SYSTEMD_SERVICE"
45+ echo "Invoking 'systemctl start ${APACHE_SYSTEMD_SERVICE}'."
46+ echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
47+ systemctl start "${APACHE_SYSTEMD_SERVICE}"
48 else
49 unset APACHE_STARTED_BY_SYSTEMD
50- $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
51+ ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
52 fi
53
54 ERROR=$?
55 ;;
56 stop|graceful-stop)
57- $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
58+ ${HTTPD} ${APACHE_ARGUMENTS} -k "$ARGV"
59 ERROR=$?
60 ;;
61 restart|graceful)
62 if $HTTPD ${APACHE_ARGUMENTS} -t 2> /dev/null ; then
63- $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
64+ if need_systemd; then
65+ # If running on systemd we should not directly restart httpd since
66+ # systemd would be confused about httpd's status.
67+ # (See LP: #1832182)
68+ echo "Invoking 'systemctl restart ${APACHE_SYSTEMD_SERVICE}'."
69+ echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
70+ systemctl restart "${APACHE_SYSTEMD_SERVICE}"
71+ else
72+ unset APACHE_STARTED_BY_SYSTEMD
73+ ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
74+ fi
75 else
76- $HTTPD ${APACHE_ARGUMENTS} -t
77+ ${HTTPD} ${APACHE_ARGUMENTS} -t
78 fi
79 ERROR=$?
80 ;;
81diff --git a/debian/changelog b/debian/changelog
82index 6295e4e..517a355 100644
83--- a/debian/changelog
84+++ b/debian/changelog
85@@ -1,3 +1,13 @@
86+apache2 (2.4.46-1ubuntu1.1) groovy; urgency=medium
87+
88+ * d/apache2ctl: Also use systemd for graceful if it is in use.
89+ (LP: #1832182)
90+ - This extends an earlier fix for the start command to behave
91+ similarly for restart / graceful. Fixes service failures on
92+ unattended upgrade.
93+
94+ -- Bryce Harrington <bryce@canonical.com> Fri, 13 Nov 2020 01:36:38 +0000
95+
96 apache2 (2.4.46-1ubuntu1) groovy; urgency=medium
97
98 * Merge with Debian unstable. Remaining changes:

Subscribers

People subscribed via source and target branches