Skip to content

4.4 to 5.2 upmerge 2024-08-29#43996

Merged
Hackwar merged 6 commits intojoomla:5.2-devfrom
Hackwar:44-52-upmerge-20240829
Aug 29, 2024
Merged

4.4 to 5.2 upmerge 2024-08-29#43996
Hackwar merged 6 commits intojoomla:5.2-devfrom
Hackwar:44-52-upmerge-20240829

Conversation

@Hackwar
Copy link
Member

@Hackwar Hackwar commented Aug 29, 2024

4.4 to 5.2 upmerge 2024-08-29

MacJoom and others added 6 commits August 26, 2024 20:47
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
* Use Connection pool for PostgreSQL in System Tests

Sometimes single specs in the System Tests fail with:
    CypressError: `cy.task('queryDB')` failed with the following error:
    > duplicate key value violates unique constraint "cpostgresmax_users_pkey"

The error happens on different specs in System Tests especially running on drone.
It could be reproduced in running the System Tests tree times (first with installation, 2nd and 3rd run w/o):
    npx cypress run
    npx cypress run --spec 'tests/System/integration/administrator/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/site/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/api/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/plugins/**/*.cy.{js,jsx,ts,tsx}'
    npx cypress run --spec 'tests/System/integration/administrator/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/site/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/api/**/*.cy.{js,jsx,ts,tsx},tests/System/integration/plugins/**/*.cy.{js,jsx,ts,tsx}'

Checking the session usage in pgAdmin shows the maximum number of 100 configured sessions appears to have been reached.
Therefore the usage of postgres connection pool is implemented.
The session usage is reduced to max 12 and the error could no more reproduced.

* Simplify implementation

- Delete function as only called once
- Renamed to postgresConnectionPool

Contributed by @laoneo

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
# Conflicts:
#	libraries/src/Version.php
@Hackwar Hackwar merged commit 1fa2a60 into joomla:5.2-dev Aug 29, 2024
@Hackwar Hackwar deleted the 44-52-upmerge-20240829 branch August 29, 2024 09:55
@richard67
Copy link
Member

This should have been merged with a merge commit, but it seems it was done with a squash commit as the commit history of the 5.2-dev branch doesn’t show the single commits from this PR.

Hackwar added a commit that referenced this pull request Aug 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants