Ubuntu
apache2 package

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

Proposed by Bryce Harrington on 2020-10-06

Status:

Rejected

Rejected by:

Bryce Harrington on 2020-11-19

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)

High

Triaged

Link a bug report

Reviewer	Date Requested	Status
Christian Ehrhardt  (community)	2020-10-06	Needs Fixing on 2020-10-06
Ubuntu Server Developers	2020-10-06	Pending
Canonical Server	2020-10-06	Pending
Review via email: mp+391856@code.qastaging.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/

Revision history for this message

Christian Ehrhardt  (paelzer) wrote on 2020-10-06:

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 on 2020-10-21:

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

Revision history for this message

Bryce Harrington (bryce) wrote on 2020-10-22:

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 on 2020-11-06:

Superseded by https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/393426