Merge ~ahasenack/ubuntu/+source/squid:cosmic-smp-fixes into ubuntu/+source/squid:ubuntu/cosmic-devel

Proposed by Andreas Hasenack
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: f1951cfb58184a00ba197bfb2a41973d7d4cac8c
Merged at revision: f1951cfb58184a00ba197bfb2a41973d7d4cac8c
Proposed branch: ~ahasenack/ubuntu/+source/squid:cosmic-smp-fixes
Merge into: ubuntu/+source/squid:ubuntu/cosmic-devel
Diff against target: 72 lines (+44/-0)
4 files modified
debian/changelog (+9/-0)
debian/patches/series (+1/-0)
debian/patches/smp-startup-error.patch (+33/-0)
debian/squid.tmpfile (+1/-0)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server packageset reviewers Pending
Review via email: mp+363809@code.launchpad.net

Description of the change

This branch fixes #1816006 and #1815852. The latter affects both cosmic and disco, and the former affects only cosmic. The disco fix is currently in migration, stuck atm because of glibc, but tests passed.

Both bugs have the SRU template filled out and testing instructions.

PPA with cosmic test packages, fixing both bugs: https://launchpad.net/~ahasenack/+archive/ubuntu/squid-smp-1815852/+packages

DEP8 results, from a local run:
(...)
Ran 7 tests in 303.966s

OK
autopkgtest [16:09:26]: test squid: -----------------------]
squid PASS
autopkgtest [16:09:26]: test squid: - - - - - - - - - - results - - - - - - - - - -
autopkgtest [16:09:27]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-test-suite PASS
squid PASS
qemu-system-x86_64: terminating on signal 15 from pid 30010 (/usr/bin/python3)

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

tmpfile changed what we reviewed for Disco (still in -proposed) already and LGTM

Thanks for identifying the patch for bug 1815852, the patch and changelog LGTM

Going to test the PPA now ...

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

Tested against the provided PPA and LGTM.
Also I have not seen other errors that you'd cause by the changes.
Approved

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, tagged and uploaded:

$ git push pkg upload/4.1-1ubuntu3.1
Enumerating objects: 24, done.
Counting objects: 100% (24/24), done.
Delta compression using up to 4 threads
Compressing objects: 100% (18/18), done.
Writing objects: 100% (19/19), 2.67 KiB | 910.00 KiB/s, done.
Total 19 (delta 12), reused 1 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/squid
 * [new tag] upload/4.1-1ubuntu3.1 -> upload/4.1-1ubuntu3.1

$ dput ubuntu ../squid_4.1-1ubuntu3.1_source.changes
Checking signature on .changes
gpg: ../squid_4.1-1ubuntu3.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../squid_4.1-1ubuntu3.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_4.1-1ubuntu3.1.dsc: done.
  Uploading squid_4.1-1ubuntu3.1.debian.tar.xz: done.
  Uploading squid_4.1-1ubuntu3.1_source.buildinfo: done.
  Uploading squid_4.1-1ubuntu3.1_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 212ff3b..0f3ab9e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+squid (4.1-1ubuntu3.1) cosmic; urgency=medium
7+
8+ * d/p/smp-startup-error.patch: fix startup error in SMP mode, when workers
9+ is set. (LP: #1815852)
10+ * d/squid.tmpfile: add tmpfiles configuration to handle /var/run/squid
11+ at boot. Thanks to Luigi Gangitano <luigi@debian.org> (LP: #1816006)
12+
13+ -- Andreas Hasenack <andreas@canonical.com> Thu, 28 Feb 2019 13:27:11 -0300
14+
15 squid (4.1-1ubuntu3) cosmic; urgency=medium
16
17 * d/p/fix-rotate-assertion.patch: Fix assertion error when rotating logs.
18diff --git a/debian/patches/series b/debian/patches/series
19index 59bf11b..0bf2e57 100644
20--- a/debian/patches/series
21+++ b/debian/patches/series
22@@ -6,3 +6,4 @@
23 0003-installed-binary-for-debian-ci.patch
24 fix-uninitialized-var.patch
25 fix-rotate-assertion.patch
26+smp-startup-error.patch
27diff --git a/debian/patches/smp-startup-error.patch b/debian/patches/smp-startup-error.patch
28new file mode 100644
29index 0000000..c6dccf5
30--- /dev/null
31+++ b/debian/patches/smp-startup-error.patch
32@@ -0,0 +1,33 @@
33+From 914599e33db01dbc6dee465ee498814b19bcf09a Mon Sep 17 00:00:00 2001
34+From: Alex Rousskov <rousskov@measurement-factory.com>
35+Date: Fri, 6 Jul 2018 23:58:22 +0000
36+Subject: [PATCH] Bug 4865: Unexpected exception on startup in
37+ TypedMsgHdr::sync() (#242)
38+
39+Commit b56b37c broke Ipc::TypedMsgHdr copying by incorrectly assuming
40+that sync() sets name and ios members. The sync() method sets _other_
41+(low level) members based on name and ios.
42+
43+Origin: https://github.com/squid-cache/squid/commit/914599e33db01dbc6dee465ee498814b19bcf09a
44+Bug: https://bugs.squid-cache.org/show_bug.cgi?id=4865
45+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1815852
46+Last-Update: 2019-02-28
47+---
48+ src/ipc/TypedMsgHdr.cc | 4 ++--
49+ 1 file changed, 2 insertions(+), 2 deletions(-)
50+
51+diff --git a/src/ipc/TypedMsgHdr.cc b/src/ipc/TypedMsgHdr.cc
52+index 68bc2eed27..e9165dc444 100644
53+--- a/src/ipc/TypedMsgHdr.cc
54++++ b/src/ipc/TypedMsgHdr.cc
55+@@ -32,8 +32,8 @@ Ipc::TypedMsgHdr &Ipc::TypedMsgHdr::operator =(const TypedMsgHdr &tmh)
56+ {
57+ if (this != &tmh) { // skip assignment to self
58+ memcpy(static_cast<msghdr*>(this), static_cast<const msghdr*>(&tmh), sizeof(msghdr));
59+- // struct name is handled in sync()
60+- // struct ios[] is handled in sync()
61++ name = tmh.name;
62++ memcpy(&ios, &tmh.ios, sizeof(ios));
63+ data = tmh.data;
64+ ctrl = tmh.ctrl;
65+ offset = tmh.offset;
66diff --git a/debian/squid.tmpfile b/debian/squid.tmpfile
67new file mode 100644
68index 0000000..a45d96c
69--- /dev/null
70+++ b/debian/squid.tmpfile
71@@ -0,0 +1 @@
72+d /run/squid 0755 proxy proxy -

Subscribers

People subscribed via source and target branches