Merge ~ahasenack/ubuntu/+source/cyrus-sasl2:xenial-saslauthd-cpu-usage-997217 into ubuntu/+source/cyrus-sasl2:ubuntu/xenial-devel

Proposed by Andreas Hasenack
Status: Merged
Approved by: Andreas Hasenack
Approved revision: fe2f4e2bff93cee0ccf49da2d1b27984cca64cde
Merge reported by: Andreas Hasenack
Merged at revision: fe2f4e2bff93cee0ccf49da2d1b27984cca64cde
Proposed branch: ~ahasenack/ubuntu/+source/cyrus-sasl2:xenial-saslauthd-cpu-usage-997217
Merge into: ubuntu/+source/cyrus-sasl2:ubuntu/xenial-devel
Diff against target: 0 lines
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server Pending
Review via email: mp+357779@code.launchpad.net

Description of the change

Please use git for the review and ignore the launchpad diff, as it's incorrect.

Add an upstream patch to fix a condition where saslauthd could be stuck in a loop when the imap server went away.

This affected precise, which has a patch that introduced the loop, but with no exit clause (in that scenario when the imap server goes away).

Then trusty improved on that patch by adding a loop counter and exiting if that counter is hit, so trusty is not affected.

Eventually upstream adopted the original fix with no loop counter and reintroduced the bug. This was packaged for xenial, where the good trusty patch was dropped because it was deemed to be already applied in upstream.

Bionic onwards finally has the upstream version which added one last fix, and this is the fix I'm applying to the xenial package now.

Trusty still loops, but because of the loop counter, that is contained.

https://bugs.launchpad.net/ubuntu/+source/cyrus-sasl2/+bug/997217/comments/17 has a longer version of this story.

Testing instructions are in the bug.

Bileto ticket and PPA for testing: https://bileto.ubuntu.com/#/ticket/3498

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

I wonder about the test errors, but it might be an evil rabbit hole as usual.
They look good on xenial:
http://autopkgtest.ubuntu.com/packages/k/kldap/xenial/i386
http://autopkgtest.ubuntu.com/packages/q/qca2/xenial/i386

But are broken in https://bileto.ubuntu.com/excuses/3498/xenial.html

But the tests hit things not directly touched by you I think.
One is on an ABI checker and one is actually a build error of the tests.
I'm afraid there is some extra work ahead on this :-/

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

The actual packaging changes look good to me

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

Fix tested and working as described.
The output on detecting a no more available server is:
  0: NO "authentication failed"
Which is better than a hang.

+1 under the condition the test issues are resolved

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

The qca2 builds are fetching packages from an unexpected source:
Get:29 http://ftpmaster.internal/ubuntu xenial-updates/main amd64 gcc-5 amd64 5.4.0-6ubuntu1~16.04.10 [8,426 kB]
Get:30 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 libqt5printsupport5 amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [174 kB]
Get:31 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 libqt5sql5 amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [108 kB]
Get:32 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 libqt5test5 amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [88.9 kB]
Get:33 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 libqt5xml5 amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [92.2 kB]
Get:34 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 qtchooser amd64 58-gfab25f1-1~xenialoverlay~1 [22.6 kB]
Get:35 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 qt5-qmake amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [1,125 kB]
Get:36 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 qtbase5-dev-tools amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [722 kB]
Get:37 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 qtbase5-dev amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [950 kB]

What is this xenial-phone-overlay ppa, and why was it added?

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

The kldap builds are also failing due to this incorrect phone ppa being added.

In https://bileto.ubuntu.com/excuses/3498/xenial.html search for "phone" and you will get many hits, including:
Get:10 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu xenial/main amd64 libqt5gui5 amd64 5.6.2+dfsg-0ubuntu1~~xenialoverlay5~3 [2,433 kB]

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

sil2100 is aware of it and said he will investigate later.

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

The qca2 test passes locally, btw:
(xenial-qca2-dep8-check)ubuntu@xenial-qca2:~/git/packages/qca2/qca2$ debian/tests/ciphertest-qt5
Building test
-- Configuring done
-- Generating done
-- Build files have been written to: /home/ubuntu/git/packages/qca2/qca2
[100%] Built target ciphertest
OK
Running test
OK

I suspect the same would be true regarding the other package's failure, since it's also around qt.

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

Iirc that is part of the ticket setup.
Maybe a misclick there?
You can still disable on the ppa's config page to remove it - iirc that is
where I did in the past.

Andreas Hasenack <email address hidden> schrieb am Do., 25. Okt. 2018,
15:31:

> The qca2 test passes locally, btw:
> (xenial-qca2-dep8-check)ubuntu@xenial-qca2:~/git/packages/qca2/qca2$
> debian/tests/ciphertest-qt5
> Building test
> -- Configuring done
> -- Generating done
> -- Build files have been written to: /home/ubuntu/git/packages/qca2/qca2
> [100%] Built target ciphertest
> OK
> Running test
> OK
>
>
> I suspect the same would be true regarding the other package's failure,
> since it's also around qt.
> --
>
> https://code.launchpad.net/~ahasenack/ubuntu/+source/cyrus-sasl2/+git/cyrus-sasl2/+merge/357779
> You are reviewing the proposed merge of
> ~ahasenack/ubuntu/+source/cyrus-sasl2:xenial-saslauthd-cpu-usage-997217
> into ubuntu/+source/cyrus-sasl2:ubuntu/xenial-devel.
>

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

I don't think it's a ticket setup issue. "Target series" only says xenial, and the extraneous ppa is not in the ppa that builds my package, it's in the autopkgtest environment that runs tests for toe other packages. In fact, all of them, including the green ones, have the phone ppa injected.

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

Tagged and uploaded.

Preview Diff

Empty

Subscribers

People subscribed via source and target branches