Merge ~michal-maloszewski99/ubuntu/+source/apache2:passing-health-check-lp2003189-jammy into ubuntu/+source/apache2:ubuntu/jammy-devel
- Git
- lp:~michal-maloszewski99/ubuntu/+source/apache2
- passing-health-check-lp2003189-jammy
- Merge into ubuntu/jammy-devel
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | git-ubuntu bot | ||||
Approved revision: | not available | ||||
Merge reported by: | Michał Małoszewski | ||||
Merged at revision: | 7a571214b3c119d14c45561555931d8ec522a8eb | ||||
Proposed branch: | ~michal-maloszewski99/ubuntu/+source/apache2:passing-health-check-lp2003189-jammy | ||||
Merge into: | ubuntu/+source/apache2:ubuntu/jammy-devel | ||||
Diff against target: |
90 lines (+68/-0) 3 files modified
debian/changelog (+8/-0) debian/patches/reenable-workers-in-standard-error-state-jammy-apache2.patch (+59/-0) debian/patches/series (+1/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
git-ubuntu bot | Approve | ||
Bryce Harrington (community) | Approve | ||
Canonical Server Reporter | Pending | ||
Review via email: mp+439391@code.launchpad.net |
Commit message
Description of the change
Michał Małoszewski (michal-maloszewski99) wrote : | # |
Michał Małoszewski (michal-maloszewski99) wrote : | # |
I am writing SRU template which will be attached here asap.
Michał Małoszewski (michal-maloszewski99) wrote : | # |
Results: (from http://
apache2 @ amd64:
http://
22.02.23 16:53:23 ❌ Triggers: apache2/
run-
chroot FAIL 🟥
http://
21.03.23 12:26:45 ✅ Triggers: apache2/
apache2 @ arm64:
http://
22.02.23 13:40:10 ❌ Triggers: apache2/
chroot FAIL 🟥
http://
21.03.23 10:38:14 ✅ Triggers: apache2/
apache2 @ armhf:
http://
22.02.23 13:37:59 ❌ Triggers: apache2/
chroot FAIL 🟥
http://
21.03.23 10:35:13 ✅ Triggers: apache2/
apache2 @ ppc64el:
http://
22.02.23 13:36:19 ❌ Triggers: apache2/
chroot FAIL 🟥
http://
21.03.23 10:21:23 ✅ Triggers: apache2/
apache2 @ s390x:
http://
22.02.23 13:27:44 ❌ Triggers: apache2/
chroot FAIL 🟥
http://
21.03.23 10:45:24 ✅ Triggers: apache2/
Running: (none)
Waiting: (none)
Michał Małoszewski (michal-maloszewski99) wrote : | # |
I don't see any notifications from git about conflicts. Moreover locally when I open d/changelog, the changelog stanza/version is ok.
Sergio Durigan Junior (sergiodj) wrote : | # |
This is usually a sign that you used a branch other than ubuntu/jammy-devel as a starting point for your branch (e.g., you might have used ubuntu/jammy).
Michał Małoszewski (michal-maloszewski99) wrote : | # |
Michał Małoszewski (michal-maloszewski99) wrote : | # |
Autopkgtests being run locally work, so it shows that apache2 PPA dep8 tests are fleaky.
```
welcome to localhost:8529
ok 2
500 Server closed connection without sending any data back
Content-Type: text/plain
Client-Date: Wed, 22 Mar 2023 13:34:44 GMT
Client-Warning: Internal response
Server closed connection without sending any data back at /usr/share/
ok 3
ok
All tests successful.
Files=142, Tests=7294, 296 wallclock secs ( 2.25 usr 0.38 sys + 178.13 cusr 51.98 csys = 232.74 CPU)
Result: PASS
[warning] server localhost:8529 shutdown
Files=142, Tests=7294, 296 wallclock secs ( 2.25 usr 0.38 sys + 178.13 cusr 51.98 csys = 232.74 CPU)
+ grep -E '^Files=[0-9]+, Tests=[0-9]+' testlog.mpm_event
+ grep -E '^Result: PASS' testlog.mpm_event
+ grep -E '^Result: FAIL' testlog.mpm_event
+ grep -E 'server dumped core' testlog.mpm_event
+ return 0
Result: PASS
autopkgtest [14:34:46]: test run-test-suite: -------
autopkgtest [14:34:47]: test run-test-suite: - - - - - - - - - - results - - - - - - - - - -
run-test-suite PASS
autopkgtest [14:34:48]: @@@@@@@
run-test-suite PASS
qemu-system-x86_64: terminating on signal 15 from pid 63458 (/usr/bin/python3)
```
Bryce Harrington (bryce) wrote : | # |
Hi Michal,
Something does indeed seem odd with the autopkgtest runs, however this is not the "usual" flaky test problems Apache usually runs into but rather a binary version incompatibility for gcc:
Investigating (0) libcc1-0:amd64 < none -> 12-20220319-
Broken libcc1-0:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to libcc1-0:amd64 1
Investigating (0) libitm1:amd64 < none -> 12-20220319-
Broken libitm1:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to libitm1:amd64 0
Investigating (0) libatomic1:amd64 < none -> 12-20220319-
Broken libatomic1:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to libatomic1:amd64 0
Investigating (0) libubsan1:amd64 < none -> 12-20220319-
Broken libubsan1:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to libubsan1:amd64 0
Investigating (0) liblsan0:amd64 < none -> 12-20220319-
Broken liblsan0:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to liblsan0:amd64 0
Investigating (0) libquadmath0:amd64 < none -> 12-20220319-
Broken libquadmath0:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to libquadmath0:amd64 0
Investigating (0) libgomp1:amd64 < none -> 12-20220319-
Broken libgomp1:amd64 Depends on gcc-12-base:amd64 < 12.1.0-
Considering gcc-12-base:amd64 55 as a solution to libgomp1:amd64 0
Done
wget is already the newest version (1.21.2-2ubuntu1).
wget set to manually installed.
dpkg-dev is already the newest version (1.21.1ubuntu2.1).
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:
The following packages have unmet dependencies:
libatomic1 : Depends: gcc-12-base (= 12-20220319-
libcc1-0 : Depends: gcc-12-base (= 12-20220319-
libgomp1 : Depends: gcc-12-base (= 12-20220319-
libitm1 : Depends: gcc-12-base (= 12-20220319-
liblsan0 : Depends: gcc-12-base (= 12-20220319-
libquadmath0 : Depends: gcc-12-base (= 12-20220319-
libubsan1 : Depends: gcc-12-base (= 12-20220319-
Bryce Harrington (bryce) wrote : | # |
gcc-12-base (= 12-20220319-
To interpret what this means, it's saying that apache2 (or one of its build dependencies) was built with gcc-12 version 12-20220319-
So where do these versions come from?
$ pkg-versions gcc-12
### Debian ###
gcc-12 | 12.2.0-14 | bookworm
gcc-12 | 12.2.0-14 | sid
gcc-12 | 12.2.0-17 | experimental
### Ubuntu ###
gcc-12 | 12-20220319-
gcc-12 | 12.1.0-
gcc-12 | 12.1.0-
gcc-12 | 12.2.0-3ubuntu1 | kinetic
The one version matches what's in jammy-updates, however the other is from jammy release. So, it appears the conflict is that the PPA built the package with the old version of gcc-12.
Can you doublecheck your PPA configuration's dependencies? On the website go to "Edit PPA dependencies" and make sure "Ubuntu dependencies" is set to "Default" rather than "Basic". If it is set to "Basic" then change it to "Default" and re-upload your apache2 package (you'll also have to update the version number). After that, re-run the tests and they should pass.
Bryce Harrington (bryce) wrote : | # |
Oh, one other note is it seems the version of apache2 in your PPA is your prior version, apache2/
Possibly this discrepancy could be the root cause for why the tests failed.
Bryce Harrington (bryce) wrote : | # |
The rest of your packaging looks absolutely fine, and I'm tempted to just go ahead and upload it anyway, however I think it's worth having a solid set of test runs to accompany the SRU to help ensure it goes through the review process smoothly. Let me know when you've refreshed the PPA and re-run the tests.
Michał Małoszewski (michal-maloszewski99) wrote : | # |
My PPA dependencies are set to "Default" so it's fine.
Anyway, I think I'll update the versions and retrigger the PPA after these two (related to another apache2 bug) ->
https:/
https:/
will hit the unapproved queue. If I update the versions here now, the versions will be the same in the apache2 changelog in the links above, and right here in that MP. So anyway, at the end, I will have to bump versions again. So I think I should wait.
Am I right? Or should I continue with that?
Bryce Harrington (bryce) wrote : | # |
Works for me.
Did someone already try uploading those? I am not spotting evidence of the updated packages, so have re-sponsored and uploaded them:
stirling: ~/pkg/Apache2/
D: Setting host argument.
Checking signature on .changes
gpg: /home/bryce/
Checking signature on .dsc
gpg: /home/bryce/
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading apache2_
Uploading apache2_
Uploading apache2_
Uploading apache2_
Successfully uploaded packages.
D: Setting host argument.
Checking signature on .changes
gpg: /home/bryce/
Checking signature on .dsc
gpg: /home/bryce/
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading apache2_
Uploading apache2_
Uploading apache2_
Uploading apache2_
Successfully uploaded packages.
- 7a57121... by Michał Małoszewski
-
changelog (LP: #2003189)
Bryce Harrington (bryce) wrote : | # |
$ ppa tests ppa:michal-
* Triggers:
- Source apache2/
+ Trigger basic @amd64♻️ Trigger all-proposed @amd64💍
+ Trigger basic @arm64♻️ Trigger all-proposed @arm64💍
+ Trigger basic @armhf♻️ Trigger all-proposed @armhf💍
+ Trigger basic @i386♻️ Trigger all-proposed @i386💍
+ Trigger basic @ppc64el♻️ Trigger all-proposed @ppc64el💍
+ Trigger basic @s390x♻️ Trigger all-proposed @s390x💍
* Results:
- apache2/
+ ✅ apache2 on jammy for amd64 @ 04.05.23 00:25:39 Log️ 🗒️
+ ✅ apache2 on jammy for arm64 @ 04.05.23 00:48:55 Log️ 🗒️
+ ✅ apache2 on jammy for armhf @ 04.05.23 00:30:39 Log️ 🗒️
+ ✅ apache2 on jammy for ppc64el @ 04.05.23 00:27:57 Log️ 🗒️
+ ✅ apache2 on jammy for s390x @ 04.05.23 00:28:50 Log️ 🗒️
* Running: (none)
* Waiting: (none)
Looks good, uploaded:
triage-jammy+22.04: ~/pkg/Apache2/
triage-jammy+22.04: ~/pkg/Apache2/
Vcs-Git: https:/
Vcs-Git-Commit: 7a571214b3c119d
Vcs-Git-Ref: refs/heads/
triage-jammy+22.04: ~/pkg/Apache2/
signfile dsc ../apache2_
fixup_buildinfo ../apache2_
signfile buildinfo ../apache2_
fixup_changes dsc ../apache2_
fixup_changes buildinfo ../apache2_
signfile changes ../apache2_
Successfully signed dsc, buildinfo, changes files
triage-jammy+22.04: ~/pkg/Apache2/
gpg: Signature made Thu 04 May 2023 02:19:53 AM UTC
gpg: using RSA key A661100B3DAC1D4
gpg: Good signature from "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
triage-jammy+22.04: ~/pkg/Apache2/
D: Setting host argument.
Checking signature on .changes
gpg: ../apache2_
Checking signature on .dsc
gpg: ../apache2_
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading apache2_
Uploading apache2_
Uploading apache2_
Uploading apache2_
Successfully uploa...
git-ubuntu bot (git-ubuntu-bot) wrote : | # |
Approvers: bryce, michal-
Uploaders: bryce
MP auto-approved
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 56903d8..10f1284 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,11 @@ |
6 | +apache2 (2.4.52-1ubuntu4.6) jammy; urgency=medium |
7 | + |
8 | + * d/p/reenable-workers-in-standard-error-state-jammy-apache2.patch: |
9 | + fix issue with workers in apache2 which could not recover from its |
10 | + error state (LP: #2003189) |
11 | + |
12 | + -- Michal Maloszewski <michal.maloszewski@canonical.com> Wed, 03 May 2023 22:02:51 +0200 |
13 | + |
14 | apache2 (2.4.52-1ubuntu4.5) jammy; urgency=medium |
15 | |
16 | * d/p/mod_proxy_hcheck_jammy_fix_to_detect_support.patch: Fix issue |
17 | diff --git a/debian/patches/reenable-workers-in-standard-error-state-jammy-apache2.patch b/debian/patches/reenable-workers-in-standard-error-state-jammy-apache2.patch |
18 | new file mode 100644 |
19 | index 0000000..7198a34 |
20 | --- /dev/null |
21 | +++ b/debian/patches/reenable-workers-in-standard-error-state-jammy-apache2.patch |
22 | @@ -0,0 +1,59 @@ |
23 | +From f34e6c027bf566cef7bdb9ecd8e64a2fae69cde2 Mon Sep 17 00:00:00 2001 |
24 | +From: Eric Covener <covener@apache.org> |
25 | +Date: Mon, 9 Jan 2023 13:22:44 +0000 |
26 | +Subject: [PATCH] Merge r1904518 from trunk: |
27 | +Description: Re-enable workers in standard error state |
28 | +Origin: upstream, https://github.com/apache/httpd/commit/f34e6c027bf566cef7bdb9ecd8e64a2fae69cde2 |
29 | +Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=66302 |
30 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/2003189 |
31 | +Last-Update: 2023-02-22 |
32 | +--- |
33 | + CHANGES | 3 +++ |
34 | + include/ap_mmn.h | 3 ++- |
35 | + modules/proxy/mod_proxy.h | 2 ++ |
36 | + modules/proxy/mod_proxy_hcheck.c | 2 +- |
37 | + 4 files changed, 8 insertions(+), 2 deletions(-) |
38 | + |
39 | +--- a/include/ap_mmn.h |
40 | ++++ b/include/ap_mmn.h |
41 | +@@ -587,7 +587,8 @@ |
42 | + * 20120211.120 (2.4.51-dev) Add dav_liveprop_elem structure and |
43 | + * dav_get_liveprop_element(). |
44 | + * 20120211.121 (2.4.51-dev) Add ap_post_read_request() |
45 | +- * |
46 | ++ * 20120211.126 (2.4.55-dev) Add additional hcmethod_t enums and |
47 | ++ PROXY_WORKER_IS_ERROR |
48 | + */ |
49 | + |
50 | + #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ |
51 | +@@ -595,7 +596,7 @@ |
52 | + #ifndef MODULE_MAGIC_NUMBER_MAJOR |
53 | + #define MODULE_MAGIC_NUMBER_MAJOR 20120211 |
54 | + #endif |
55 | +-#define MODULE_MAGIC_NUMBER_MINOR 121 /* 0...n */ |
56 | ++#define MODULE_MAGIC_NUMBER_MINOR 126 /* 0...n */ |
57 | + |
58 | + /** |
59 | + * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |
60 | +--- a/modules/proxy/mod_proxy.h |
61 | ++++ b/modules/proxy/mod_proxy.h |
62 | +@@ -354,6 +354,8 @@ |
63 | + |
64 | + #define PROXY_WORKER_IS_HCFAILED(f) ( (f)->s->status & PROXY_WORKER_HC_FAIL ) |
65 | + |
66 | ++#define PROXY_WORKER_IS_ERROR(f) ( (f)->s->status & PROXY_WORKER_IN_ERROR ) |
67 | ++ |
68 | + #define PROXY_WORKER_IS(f, b) ( (f)->s->status & (b) ) |
69 | + |
70 | + /* default worker retry timeout in seconds */ |
71 | +--- a/modules/proxy/mod_proxy_hcheck.c |
72 | ++++ b/modules/proxy/mod_proxy_hcheck.c |
73 | +@@ -909,7 +909,7 @@ |
74 | + (int)hc->s->method); |
75 | + } |
76 | + /* what state are we in ? */ |
77 | +- else if (PROXY_WORKER_IS_HCFAILED(worker)) { |
78 | ++ else if (PROXY_WORKER_IS_HCFAILED(worker) || PROXY_WORKER_IS_ERROR(worker)) { |
79 | + if (rv == APR_SUCCESS) { |
80 | + worker->s->pcount += 1; |
81 | + if (worker->s->pcount >= worker->s->passes) { |
82 | diff --git a/debian/patches/series b/debian/patches/series |
83 | index 305f31a..fd21a1e 100644 |
84 | --- a/debian/patches/series |
85 | +++ b/debian/patches/series |
86 | @@ -32,3 +32,4 @@ CVE-2023-25690-1.patch |
87 | CVE-2023-25690-2.patch |
88 | CVE-2023-27522.patch |
89 | mod_proxy_hcheck_jammy_fix_to_detect_support.patch |
90 | +reenable-workers-in-standard-error-state-jammy-apache2.patch |
I didn't see any merge conflicts locally so far. I'm going to fix it.