Merge ~bryce/ubuntu/+source/apache2:apache2-fix-lp1832182-hirsute into ubuntu/+source/apache2:ubuntu/devel

Proposed by Bryce Harrington on 2020-11-06
Status: Approved
Approved by: Bryce Harrington on 2020-11-19
Approved revision: 2fea15554926ad8a677ad04b3720d73a7cca08d7
Proposed branch: ~bryce/ubuntu/+source/apache2:apache2-fix-lp1832182-hirsute
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
Bryce Harrington Approve on 2020-11-19
Lucas Kanashiro 2020-11-06 Needs Fixing on 2020-11-12
Canonical Server packageset reviewers 2020-11-06 Pending
Canonical Server Team 2020-11-06 Pending
Review via email: mp+393426@code.launchpad.net

Description of the change

This is a re-send of a server-next fix for Apache2, which supersedes an earlier MP targeting groovy: https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/391856

This fixes some errors in the earlier code and incorporates Christian's review comments. I've tested the code via the test case in the bug with some variations, and it seems good. Autopkgtest checks out too, although the test cases don't exercise the 'graceful' command.

The issue is applicable to all past supported releases, so once this is accepted for hirsute I plan to also apply it to groovy, focal, bionic, and xenial. Thus please also review the SRU text in the bug report itself.

To post a comment you must log in.
Lucas Kanashiro (lucaskanashiro) wrote :

I am grabbing this for review.

Lucas Kanashiro (lucaskanashiro) wrote :

The package changes and the SRU bug description LGMT in general, just some comments below:

- In the changelog your target is groovy but this MP is targeting hirsute.

- This is me being nitpick: I would change this commit message:

commit a4a20160eefd3cd0a3cb07d2a95fb9665c1f2b16
Author: Bryce Harrington <email address hidden>
Date: Mon Oct 5 16:03:00 2020 -0700

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

to something like:

    * 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.

It is a better reading IMO.

- I see this same bug was reported to Debian here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

Could we forward these changes to Debian as well?

Apart from that the package built fine and I was able to confirm that the fix is working as expected (following the instructions in the SRU bug). I also confirmed that autopkgtest did not identify any regression (despite it does not exercise the path of proposed changes):

autopkgtest [10:51:10]: @@@@@@@@@@@@@@@@@@@@ summary
run-test-suite PASS
duplicate-module-load PASS
htcacheclean PASS
default-mods PASS
ssl-passphrase PASS
check-http2 PASS
chroot PASS

review: Needs Fixing
Bryce Harrington (bryce) wrote :

Thanks for the review. I've incorporated the suggested changes.

I've forwarded the debdiff to debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

Branch and PPA are updated.

Bryce Harrington (bryce) wrote :

Since I incorporated all the review feedback, and since Christian also reviewed and approved the same changes for the SRUs I've gone ahead and uploaded this one too.

review: Approve

Unmerged commits

2fea155... by Bryce Harrington on 2020-10-05

changelog

b021a2a... by Bryce Harrington on 2020-10-05

  * 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..9cdcc74 100644
83--- a/debian/changelog
84+++ b/debian/changelog
85@@ -1,3 +1,13 @@
86+apache2 (2.4.46-1ubuntu2) hirsute; 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> Mon, 05 Oct 2020 16:06:32 -0700
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