public inbox for [email protected]
help / color / mirror / Atom feedPgBouncer 1.24.0 - New upstream version
15+ messages / 3 participants
[nested] [flat]
* PgBouncer 1.24.0 - New upstream version
@ 2025-01-11 08:46 Bradford Boyle <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Bradford Boyle @ 2025-01-11 08:46 UTC (permalink / raw)
To: pgsql-pkg-debian
Hi All,
PgBouncer 1.24.0 was recently released [0]. I've updated the Debian
package with this new version but I am running into some issues with the
autopkgtests. The autopkgtests passes on Salsa's CI but is failing on
my both my local system and jengus [1].
On my local system, the test fails to create a new regress cluster
because port 5432 is already in use. I recently switched my sbuild
configuration from schroot to unshare. It looks like the unshare backend
doesn't create a new network namespace when running the autopkgtests.
If I stop the main postgres cluster on my machine before running
sbuild/autopkgtest, then the test passes. After reviewing the
autopkgtest docs [2] and the test script, I think we might need to add
isolation-container to the test's restrictions. On my local system, this
causes the test to be skipped since the unshare backend doesn't provide
this capability.
I will try to look in to this some more in the next few days, but I
wanted to check and see if anyone had run into similar issues with
building and testing other packages.
-- Bradford
[0]: https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_24_0
[1]: https://jengus.postgresql.org/job/pgbouncer-binaries/101/architecture=amd64,distribution=sid/
[2]: https://people.debian.org/~eriberto/README.package-tests.html
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-12 12:47 Brian Cosgrove <[email protected]>
parent: Bradford Boyle <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-01-12 12:47 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
Hey Bradford,
I haven't run into that issue myself but will poke at it today and see if I
can reproduce it.
Unrelated to autopkgtest, I noticed in October that during debbuild the
package does not run the main pytest suite for pgbouncer? Is that
intentional? It appears that before the tests were rewritten in python that
the package ran the shell-based suite properly.
I submitted a patch that should be able to be incorporated as-is:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1085109
On Sat, Jan 11, 2025 at 2:46 AM Bradford Boyle <[email protected]>
wrote:
> Hi All,
>
> PgBouncer 1.24.0 was recently released [0]. I've updated the Debian
> package with this new version but I am running into some issues with the
> autopkgtests. The autopkgtests passes on Salsa's CI but is failing on
> my both my local system and jengus [1].
>
> On my local system, the test fails to create a new regress cluster
> because port 5432 is already in use. I recently switched my sbuild
> configuration from schroot to unshare. It looks like the unshare backend
> doesn't create a new network namespace when running the autopkgtests.
> If I stop the main postgres cluster on my machine before running
> sbuild/autopkgtest, then the test passes. After reviewing the
> autopkgtest docs [2] and the test script, I think we might need to add
> isolation-container to the test's restrictions. On my local system, this
> causes the test to be skipped since the unshare backend doesn't provide
> this capability.
>
> I will try to look in to this some more in the next few days, but I
> wanted to check and see if anyone had run into similar issues with
> building and testing other packages.
>
> -- Bradford
>
> [0]: https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_1_24_0
> [1]:
> https://jengus.postgresql.org/job/pgbouncer-binaries/101/architecture=amd64,distribution=sid/
> [2]: https://people.debian.org/~eriberto/README.package-tests.html
>
>
>
--
Brian Cosgrove
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-13 04:13 Bradford Boyle <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Bradford Boyle @ 2025-01-13 04:13 UTC (permalink / raw)
To: Brian Cosgrove <[email protected]>; +Cc: pgsql-pkg-debian
Hi Brian,
On Sun, Jan 12, 2025 at 4:47 AM Brian Cosgrove <[email protected]> wrote:
>
> Unrelated to autopkgtest, I noticed in October that during debbuild
> the package does not run the main pytest suite for pgbouncer? Is that
> intentional? It appears that before the tests were rewritten in python
> that the package ran the shell-based suite properly.
Looking at the history for d/rules, I think disabling the main test
suite during the build was intended to be a temporary fix for a missing
file in the upstream source archive [0],[1]. It looks like the tests
weren't re-enabled when the issue was fixed upstream.
> I submitted a patch that should be able to be incorporated as-is:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1085109
I've applied your patch to the package and pushed the changes to Salsa.
I did have to drop the b-d on python3-contextlib2 since this package is
not available (and not needed) in unstable. I also had to add
tzdata-legacy in order for the tests to pass. We'll probably need to add
some tweaks for the pgdg packages to build on older distributions.
[0]: https://salsa.debian.org/postgresql/pgbouncer/-/commit/74f05a0#8756c63497c8dc39f7773438edf53b220c773...
[1]: https://github.com/pgbouncer/pgbouncer/issues/431
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-21 04:42 Bradford Boyle <[email protected]>
parent: Bradford Boyle <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Bradford Boyle @ 2025-01-21 04:42 UTC (permalink / raw)
To: Brian Cosgrove <[email protected]>; +Cc: pgsql-pkg-debian
Hi Brian,
I was looking at the package for pgBouncer 1.24.0 again today and it
looks like the tests are failing [0]. After reading through the logs, it
looks like psycopg in testing and unstable was updated to 3.2.4 this
past Friday. I am able to reproduce the test failures in dev environment
by updating the version in requirements.txt. Should we disable the main
test suite for now to unblock the upload of 1.24.0?
Regards,
--Bradford
[0]: https://salsa.debian.org/postgresql/pgbouncer/-/jobs/6962351
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-21 05:25 Brian Cosgrove <[email protected]>
parent: Bradford Boyle <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-01-21 05:25 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
Yes, please do. A Postgres client package (psycopg) update causing failing
integration tests seems highly unlikely to be a genuine issue for the
pgbouncer.
I also reproduced locally the failures you're seeing on Salsa. I notice
that there are relevant changes in psycopg 3.2.4 and I think that there are
some assertions needing updates in the upstream project.
I'll file an issue with pgbouncer but for now please unblock the upload.
On Mon, Jan 20, 2025 at 10:42 PM Bradford Boyle <[email protected]>
wrote:
> Hi Brian,
>
> I was looking at the package for pgBouncer 1.24.0 again today and it
> looks like the tests are failing [0]. After reading through the logs, it
> looks like psycopg in testing and unstable was updated to 3.2.4 this
> past Friday. I am able to reproduce the test failures in dev environment
> by updating the version in requirements.txt. Should we disable the main
> test suite for now to unblock the upload of 1.24.0?
>
> Regards,
>
> --Bradford
>
> [0]: https://salsa.debian.org/postgresql/pgbouncer/-/jobs/6962351
>
--
Brian Cosgrove
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-21 05:38 Brian Cosgrove <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-01-21 05:38 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
I think this note in the psycopg 3.2.4 news is what we're seeing in the
pgbouncer tests:
https://github.com/psycopg/psycopg/compare/3.2.3...3.2.4#diff-87f7a7bb7fe8dbed76e16b67b87f27bda7b779...
On Mon, Jan 20, 2025 at 11:25 PM Brian Cosgrove <[email protected]> wrote:
> Yes, please do. A Postgres client package (psycopg) update causing failing
> integration tests seems highly unlikely to be a genuine issue for the
> pgbouncer.
>
> I also reproduced locally the failures you're seeing on Salsa. I notice
> that there are relevant changes in psycopg 3.2.4 and I think that there are
> some assertions needing updates in the upstream project.
>
> I'll file an issue with pgbouncer but for now please unblock the upload.
>
> On Mon, Jan 20, 2025 at 10:42 PM Bradford Boyle <
> [email protected]> wrote:
>
>> Hi Brian,
>>
>> I was looking at the package for pgBouncer 1.24.0 again today and it
>> looks like the tests are failing [0]. After reading through the logs, it
>> looks like psycopg in testing and unstable was updated to 3.2.4 this
>> past Friday. I am able to reproduce the test failures in dev environment
>> by updating the version in requirements.txt. Should we disable the main
>> test suite for now to unblock the upload of 1.24.0?
>>
>> Regards,
>>
>> --Bradford
>>
>> [0]: https://salsa.debian.org/postgresql/pgbouncer/-/jobs/6962351
>>
>
>
> --
> Brian Cosgrove
>
--
Brian Cosgrove
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-21 05:55 Brian Cosgrove <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-01-21 05:55 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
Ah, funny, we (pgbouncer) just started pinning this in requirements.txt
because of this failure:
https://github.com/pgbouncer/pgbouncer/commit/0cf59fadc0671a7363afa51086631b87a26893dc
On Mon, Jan 20, 2025 at 11:38 PM Brian Cosgrove <[email protected]> wrote:
> I think this note in the psycopg 3.2.4 news is what we're seeing in the
> pgbouncer tests:
> https://github.com/psycopg/psycopg/compare/3.2.3...3.2.4#diff-87f7a7bb7fe8dbed76e16b67b87f27bda7b779...
>
>
> On Mon, Jan 20, 2025 at 11:25 PM Brian Cosgrove <[email protected]>
> wrote:
>
>> Yes, please do. A Postgres client package (psycopg) update causing
>> failing integration tests seems highly unlikely to be a genuine issue for
>> the pgbouncer.
>>
>> I also reproduced locally the failures you're seeing on Salsa. I notice
>> that there are relevant changes in psycopg 3.2.4 and I think that there are
>> some assertions needing updates in the upstream project.
>>
>> I'll file an issue with pgbouncer but for now please unblock the upload.
>>
>> On Mon, Jan 20, 2025 at 10:42 PM Bradford Boyle <
>> [email protected]> wrote:
>>
>>> Hi Brian,
>>>
>>> I was looking at the package for pgBouncer 1.24.0 again today and it
>>> looks like the tests are failing [0]. After reading through the logs, it
>>> looks like psycopg in testing and unstable was updated to 3.2.4 this
>>> past Friday. I am able to reproduce the test failures in dev environment
>>> by updating the version in requirements.txt. Should we disable the main
>>> test suite for now to unblock the upload of 1.24.0?
>>>
>>> Regards,
>>>
>>> --Bradford
>>>
>>> [0]: https://salsa.debian.org/postgresql/pgbouncer/-/jobs/6962351
>>>
>>
>>
>> --
>> Brian Cosgrove
>>
>
>
> --
> Brian Cosgrove
>
--
Brian Cosgrove
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-21 06:11 Brian Cosgrove <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-01-21 06:11 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
Thanks for the heads up, Bradford.
https://github.com/pgbouncer/pgbouncer/pull/1250
On Mon, Jan 20, 2025 at 11:55 PM Brian Cosgrove <[email protected]> wrote:
> Ah, funny, we (pgbouncer) just started pinning this in requirements.txt
> because of this failure:
> https://github.com/pgbouncer/pgbouncer/commit/0cf59fadc0671a7363afa51086631b87a26893dc
>
> On Mon, Jan 20, 2025 at 11:38 PM Brian Cosgrove <[email protected]>
> wrote:
>
>> I think this note in the psycopg 3.2.4 news is what we're seeing in the
>> pgbouncer tests:
>> https://github.com/psycopg/psycopg/compare/3.2.3...3.2.4#diff-87f7a7bb7fe8dbed76e16b67b87f27bda7b779...
>>
>>
>> On Mon, Jan 20, 2025 at 11:25 PM Brian Cosgrove <[email protected]>
>> wrote:
>>
>>> Yes, please do. A Postgres client package (psycopg) update causing
>>> failing integration tests seems highly unlikely to be a genuine issue for
>>> the pgbouncer.
>>>
>>> I also reproduced locally the failures you're seeing on Salsa. I notice
>>> that there are relevant changes in psycopg 3.2.4 and I think that there are
>>> some assertions needing updates in the upstream project.
>>>
>>> I'll file an issue with pgbouncer but for now please unblock the upload.
>>>
>>> On Mon, Jan 20, 2025 at 10:42 PM Bradford Boyle <
>>> [email protected]> wrote:
>>>
>>>> Hi Brian,
>>>>
>>>> I was looking at the package for pgBouncer 1.24.0 again today and it
>>>> looks like the tests are failing [0]. After reading through the logs, it
>>>> looks like psycopg in testing and unstable was updated to 3.2.4 this
>>>> past Friday. I am able to reproduce the test failures in dev environment
>>>> by updating the version in requirements.txt. Should we disable the main
>>>> test suite for now to unblock the upload of 1.24.0?
>>>>
>>>> Regards,
>>>>
>>>> --Bradford
>>>>
>>>> [0]: https://salsa.debian.org/postgresql/pgbouncer/-/jobs/6962351
>>>>
>>>
>>>
>>> --
>>> Brian Cosgrove
>>>
>>
>>
>> --
>> Brian Cosgrove
>>
>
>
> --
> Brian Cosgrove
>
--
Brian Cosgrove
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-01-22 06:47 Bradford Boyle <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Bradford Boyle @ 2025-01-22 06:47 UTC (permalink / raw)
To: pgsql-pkg-debian
Hi Christoph,
I've updated the package for pgbouncer to include a patch based on [0]
to get the main test suite passing on salsa.debian.org. With this, the
package should be ready for review and upload.
I've also attached an initial patch to generate-pgdg-source that should
add the required dependency on python3-contextlib2 and remove the
dependency on tzdata-legacy to get the pacakge building on older
distributions.
Regards,
-- Bradford
[0]: https://github.com/pgbouncer/pgbouncer/pull/1250
Attachments:
[application/octet-stream] 0001-Add-pgbouncer-tweaks-for-older-dists.patch (982B, 2-0001-Add-pgbouncer-tweaks-for-older-dists.patch)
download | inline diff:
From 109283ab827ad6c760ed6cbf297b634cf5065a40 Mon Sep 17 00:00:00 2001
From: "Bradford D. Boyle" <[email protected]>
Date: Tue, 21 Jan 2025 22:39:22 -0800
Subject: [PATCH] Add pgbouncer tweaks for older dists
---
jenkins/generate-pgdg-source | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source
index 0e04215..4de15a8 100755
--- a/jenkins/generate-pgdg-source
+++ b/jenkins/generate-pgdg-source
@@ -295,6 +295,15 @@ case $PACKAGE in
;;
esac
;;
+ pgbouncer)
+ case ${distribution:-} in
+ bookworm|bullseye|noble|jammy|focal)
+ sed -e '/python3-filelock/a \ python3-contextlib2,' -e '/tzdata-legacy/d' debian/control
+ TWEAK+=("Remove tzdata-legacy dependency")
+ TWEAK+=("Add python3-contextlib2 dependency")
+ ;;
+ esac
+ ;;
esac
# remove artifacts from last build (-r because sometimes uscan leaves temp directories behind)
--
2.48.1
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-02-04 15:05 Christoph Berg <[email protected]>
parent: Bradford Boyle <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Christoph Berg @ 2025-02-04 15:05 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
Re: Bradford Boyle
> Hi Christoph,
>
> I've updated the package for pgbouncer to include a patch based on [0]
> to get the main test suite passing on salsa.debian.org. With this, the
> package should be ready for review and upload.
Hi Bradford,
thanks!
> I've also attached an initial patch to generate-pgdg-source that should
> add the required dependency on python3-contextlib2 and remove the
> dependency on tzdata-legacy to get the pacakge building on older
> distributions.
Unfortunately that needs more work as it looks like:
bookworm and others:
14:54:22 E AttributeError: 'PGconn' object has no attribute 'close_prepared'
https://jengus.postgresql.org/job/pgbouncer-binaries/106/architecture=amd64,distribution=bookworm/co...
bullseye doesn't have python3-psycopg (and building that doesn't look
trivial). Do we think we could go without or with less tests there?
Christoph
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-02-05 07:40 Bradford Boyle <[email protected]>
parent: Christoph Berg <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Bradford Boyle @ 2025-02-05 07:40 UTC (permalink / raw)
To: Christoph Berg <[email protected]>; Bradford Boyle <[email protected]>; pgsql-pkg-debian
On Tue, Feb 4, 2025 at 7:06 AM Christoph Berg <[email protected]> wrote:
>
> Unfortunately that needs more work as it looks like:
>
> bookworm and others:
>
> 14:54:22 E AttributeError: 'PGconn' object has no attribute 'close_prepared'
>
> https://jengus.postgresql.org/job/pgbouncer-binaries/106/architecture=amd64,distribution=bookworm/co...
Yeah -- it looks like close_prepared was added in psycopg 3.2.0 and
bookworm has 3.1.7. I could patch the tests to include a skipif based on
the version of psycopg.
> bullseye doesn't have python3-psycopg (and building that doesn't look
> trivial). Do we think we could go without or with less tests there?
I think we could go without tests on bullseye since it seems like we are
nearing the trixie release and bullseye will become old old stable.
(Correct me if I am wrong on this point, I'm making this assumption
based on the trixie freeze dates). There's probably little value in
creating extra work here.
It looks like d/rules for pgbouncer will skip the tests if nocheck is in
DEB_BUILD_OPTIONS -- is this something that can be configured via the Jenkins
YAML? I am not very familiar with the Jenkins job builder YAML and I didn't see
any usages of that in the current set of jobs. Or would I need to update
generate-pgdg-source to include an additional tweak to disable the tests on
older platforms?
Thanks,
-- Bradford
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-02-05 09:09 Christoph Berg <[email protected]>
parent: Bradford Boyle <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Christoph Berg @ 2025-02-05 09:09 UTC (permalink / raw)
To: Bradford Boyle <[email protected]>; +Cc: pgsql-pkg-debian
Re: Bradford Boyle
> I think we could go without tests on bullseye since it seems like we are
> nearing the trixie release and bullseye will become old old stable.
> (Correct me if I am wrong on this point, I'm making this assumption
> based on the trixie freeze dates). There's probably little value in
> creating extra work here.
Or we just don't update the package on bullseye, leaving it at 1.23.1.
But there is still the autopkgtest, so we still have test coverage
there.
> It looks like d/rules for pgbouncer will skip the tests if nocheck is in
> DEB_BUILD_OPTIONS -- is this something that can be configured via the Jenkins
> YAML? I am not very familiar with the Jenkins job builder YAML and I didn't see
> any usages of that in the current set of jobs. Or would I need to update
> generate-pgdg-source to include an additional tweak to disable the tests on
> older platforms?
Any of these would work.
DEB_BUILD_OPTIONS=nocheck would have to be set in the sbuild-package
script. That's probably the easiest way forward.
The extra test dependencies need annotating with <!nocheck> so the
build doesn't try to install them.
Christoph
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-02-05 12:40 Brian Cosgrove <[email protected]>
parent: Christoph Berg <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-02-05 12:40 UTC (permalink / raw)
To: Christoph Berg <[email protected]>; Bradford Boyle <[email protected]>; pgsql-pkg-debian
Skipping this release for bullseye is not entirely unreasonable with Trixie
pending.
Skipping the entire suite feels unreasonable if the Postgres Debian team
releases 1.24.
I am working up a patch that will skip only these tests that will likely be
accepted upstream as well, should Debian choose to release 1.24 for
bullseye.
https://github.com/pgbouncer/pgbouncer/pull/1266
On Wed, Feb 5, 2025 at 3:10 AM Christoph Berg <[email protected]> wrote:
> Re: Bradford Boyle
> > I think we could go without tests on bullseye since it seems like we are
> > nearing the trixie release and bullseye will become old old stable.
> > (Correct me if I am wrong on this point, I'm making this assumption
> > based on the trixie freeze dates). There's probably little value in
> > creating extra work here.
>
> Or we just don't update the package on bullseye, leaving it at 1.23.1.
> But there is still the autopkgtest, so we still have test coverage
> there.
>
> > It looks like d/rules for pgbouncer will skip the tests if nocheck is in
> > DEB_BUILD_OPTIONS -- is this something that can be configured via the
> Jenkins
> > YAML? I am not very familiar with the Jenkins job builder YAML and I
> didn't see
> > any usages of that in the current set of jobs. Or would I need to update
> > generate-pgdg-source to include an additional tweak to disable the tests
> on
> > older platforms?
>
> Any of these would work.
>
> DEB_BUILD_OPTIONS=nocheck would have to be set in the sbuild-package
> script. That's probably the easiest way forward.
>
> The extra test dependencies need annotating with <!nocheck> so the
> build doesn't try to install them.
>
> Christoph
>
>
>
--
Brian Cosgrove
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-02-05 17:01 Brian Cosgrove <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 1 reply; 15+ messages in thread
From: Brian Cosgrove @ 2025-02-05 17:01 UTC (permalink / raw)
To: Christoph Berg <[email protected]>; Bradford Boyle <[email protected]>; pgsql-pkg-debian
Attached in DEP-3 format, I think, if it helps at all.
On Wed, Feb 5, 2025 at 6:40 AM Brian Cosgrove <[email protected]> wrote:
> Skipping this release for bullseye is not entirely unreasonable with
> Trixie pending.
>
> Skipping the entire suite feels unreasonable if the Postgres Debian team
> releases 1.24.
>
> I am working up a patch that will skip only these tests that will likely
> be accepted upstream as well, should Debian choose to release 1.24 for
> bullseye.
>
> https://github.com/pgbouncer/pgbouncer/pull/1266
>
>
>
> On Wed, Feb 5, 2025 at 3:10 AM Christoph Berg <[email protected]> wrote:
>
>> Re: Bradford Boyle
>> > I think we could go without tests on bullseye since it seems like we are
>> > nearing the trixie release and bullseye will become old old stable.
>> > (Correct me if I am wrong on this point, I'm making this assumption
>> > based on the trixie freeze dates). There's probably little value in
>> > creating extra work here.
>>
>> Or we just don't update the package on bullseye, leaving it at 1.23.1.
>> But there is still the autopkgtest, so we still have test coverage
>> there.
>>
>> > It looks like d/rules for pgbouncer will skip the tests if nocheck is in
>> > DEB_BUILD_OPTIONS -- is this something that can be configured via the
>> Jenkins
>> > YAML? I am not very familiar with the Jenkins job builder YAML and I
>> didn't see
>> > any usages of that in the current set of jobs. Or would I need to update
>> > generate-pgdg-source to include an additional tweak to disable the
>> tests on
>> > older platforms?
>>
>> Any of these would work.
>>
>> DEB_BUILD_OPTIONS=nocheck would have to be set in the sbuild-package
>> script. That's probably the easiest way forward.
>>
>> The extra test dependencies need annotating with <!nocheck> so the
>> build doesn't try to install them.
>>
>> Christoph
>>
>>
>>
>
> --
> Brian Cosgrove
>
--
Brian Cosgrove
Attachments:
[application/octet-stream] fix-bullseye-pgbouncer-1.24.patch (1.9K, 3-fix-bullseye-pgbouncer-1.24.patch)
download | inline diff:
diff --git a/debian/patches/fix-psycopg-close-tests.patch b/debian/patches/fix-psycopg-close-tests.patch
new file mode 100644
index 0000000..9b69d89
--- /dev/null
+++ b/debian/patches/fix-psycopg-close-tests.patch
@@ -0,0 +1,29 @@
+Description: Skip tests for Close messages on psycopg < 3.2
+Origin: upstream, https://github.com/pgbouncer/pgbouncer/pull/1266
+Last-Update: 2025-02-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/test_prepared.py
++++ b/test/test_prepared.py
+@@ -311,6 +311,10 @@ def test_describe_non_existent_prepared_statement(bouncer):
+
+ # libpq before PG17 does not support sending Close messages
+ @pytest.mark.skipif("psycopg.pq.version() < 170000")
[email protected](
++ "psycopg.__version__ < '3.2.0'",
++ reason="Debian oldstable doesn't support a version of psycopg with 'close_prepared' support",
++)
+ def test_close_prepared_statement(bouncer):
+ with bouncer.conn() as conn:
+ result = conn.pgconn.prepare(b"test", b"SELECT 1")
+@@ -338,8 +342,9 @@ def test_statement_name_longer_than_pkt_buf(bouncer):
+ assert result.status == pq.ExecStatus.TUPLES_OK
+ assert result.get_value(0, 0) == b"abc"
+
+- if psycopg.pq.version() >= 170000:
++ if psycopg.pq.version() >= 170000 and psycopg.__version__ >= "3.2.0":
+ # libpq before PG17 does not support sending Close messages
++ # Debian oldstable does not package psycopg with 'close_prepared'
+ result = conn.pgconn.close_prepared(name)
+ assert result.status == pq.ExecStatus.COMMAND_OK
+ # Ensure that the close was successful
diff --git a/debian/patches/series b/debian/patches/series
index 19f790e..5d78651 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix-psycopg-close-tests.patch
debian-config
update-test-assertions.patch
^ permalink raw reply [nested|flat] 15+ messages in thread
* Re: PgBouncer 1.24.0 - New upstream version
@ 2025-02-17 01:53 Bradford Boyle <[email protected]>
parent: Brian Cosgrove <[email protected]>
0 siblings, 0 replies; 15+ messages in thread
From: Bradford Boyle @ 2025-02-17 01:53 UTC (permalink / raw)
To: Brian Cosgrove <[email protected]>; +Cc: Christoph Berg <[email protected]>; pgsql-pkg-debian
On Wed, Feb 5, 2025 at 9:01 AM Brian Cosgrove <[email protected]> wrote:
>
> Attached in DEP-3 format, I think, if it helps at all.
Thanks. I've applied that and pushed a new commit to s.d.o with this
patch and bumping to the package version. Attached is a patch for pgapt
to skip pgbouncer for bullseye -- this seemed like the least amount of
work and there were no objections to leaving bullseye on 1.23.1.
I think with an upload of 1.24.0-2 and skipping bullseye, this should
could get pgbouncer updated in PGDG.
Regards,
-- Bradford
Attachments:
[application/octet-stream] 0001-Exclude-pgbouncer-from-bullseye.patch (759B, 2-0001-Exclude-pgbouncer-from-bullseye.patch)
download | inline diff:
From 600754acb8d9e8e84a577a4cf1046ae5847b50a8 Mon Sep 17 00:00:00 2001
From: "Bradford D. Boyle" <[email protected]>
Date: Sun, 16 Feb 2025 17:41:12 -0800
Subject: [PATCH] Exclude pgbouncer from bullseye
pgbouncer build-depends on python3-psycopg2 which is not available in
bullseye.
---
jenkins/pgapt-jobs.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 9b1cad2..9b9322c 100644
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -1375,6 +1375,7 @@
- project:
name: pgbouncer
git-url: https://salsa.debian.org/postgresql/pgbouncer.git
+ dist-filter: '!(distribution in ["bullseye"])'
jobs:
- git-packages
--
2.48.1
^ permalink raw reply [nested|flat] 15+ messages in thread
end of thread, other threads:[~2025-02-17 01:53 UTC | newest]
Thread overview: 15+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2025-01-11 08:46 PgBouncer 1.24.0 - New upstream version Bradford Boyle <[email protected]>
2025-01-12 12:47 ` Brian Cosgrove <[email protected]>
2025-01-13 04:13 ` Bradford Boyle <[email protected]>
2025-01-21 04:42 ` Bradford Boyle <[email protected]>
2025-01-21 05:25 ` Brian Cosgrove <[email protected]>
2025-01-21 05:38 ` Brian Cosgrove <[email protected]>
2025-01-21 05:55 ` Brian Cosgrove <[email protected]>
2025-01-21 06:11 ` Brian Cosgrove <[email protected]>
2025-01-22 06:47 ` Bradford Boyle <[email protected]>
2025-02-04 15:05 ` Christoph Berg <[email protected]>
2025-02-05 07:40 ` Bradford Boyle <[email protected]>
2025-02-05 09:09 ` Christoph Berg <[email protected]>
2025-02-05 12:40 ` Brian Cosgrove <[email protected]>
2025-02-05 17:01 ` Brian Cosgrove <[email protected]>
2025-02-17 01:53 ` Bradford Boyle <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox