Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DPE-3050] Template config #159

Merged
merged 26 commits into from
Apr 2, 2024
Merged

[DPE-3050] Template config #159

merged 26 commits into from
Apr 2, 2024

Conversation

dragomirp
Copy link
Contributor

@dragomirp dragomirp commented Feb 20, 2024 •
edited
Loading

Port of canonical/pgbouncer-k8s-operator#186

Use template to render PGB config. Tired to bring the k8s and vm implementatiion closer.

@dragomirp dragomirp force-pushed the dpe-3050-templated-config branch 2 times, most recently from f96c1d9 to 18847a1 Compare February 20, 2024 20:05
@dragomirp dragomirp force-pushed the dpe-3050-templated-config branch 4 times, most recently from f0994d3 to 17631ef Compare March 20, 2024 14:18
@dragomirp dragomirp force-pushed the dpe-3050-templated-config branch 4 times, most recently from 8760712 to 32df1cc Compare March 20, 2024 20:31
@dragomirp dragomirp force-pushed the dpe-3050-templated-config branch 3 times, most recently from f0b3fcf to d1661ad Compare March 20, 2024 23:09
@dragomirp dragomirp force-pushed the dpe-3050-templated-config branch 2 times, most recently from 24be453 to 177b070 Compare March 21, 2024 12:16
@dragomirp dragomirp force-pushed the dpe-3050-templated-config branch 7 times, most recently from 44c0584 to a3f3f07 Compare March 23, 2024 00:02
dragomirp and others added 2 commits March 24, 2024 23:53
@dragomirp
Check that secret is up to date (#192)
cbe7362 
* Check that secret is up to date

* Check for stale secret in backend ready

* Check for stale secret in on start

* Always regenerate dbs and reuse backend if available

* Str keys for db mapping

* Try to test all units connection

* Fix expose flag checking

* Update userlist on peer change
@dragomirp
exit backend broken on missing peer rel
26caa75
dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
src/charm.py
Comment on lines +374 to +379
if (
(auth_file := self.get_secret(APP_SCOPE, AUTH_FILE_DATABAG_KEY))
and self.backend.auth_user
and self.backend.auth_user in auth_file
):
self.render_auth_file(auth_file)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Breaking the subordinate relation will not break the backend database relation. If the user changes the backend relation while no pgb units are around, the secret will be stale referring to an old or non-existent relation.

dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
src/charm.py
Comment on lines +450 to +454
try:
self.render_pgb_config(reload_pgbouncer=True)
except ModelError:
logger.warning("Deferring on_config_changed: cannot set secret label")
event.defer()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI was failing consistently with the ops/juju bug about setting a label while getting an application secret. Juju fix was committed, but it seems that 3.1.7 is still affected.

dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
src/charm.py
if self.unit.status.message == EXTENSIONS_BLOCKING_MESSAGE:
return BlockedStatus(EXTENSIONS_BLOCKING_MESSAGE)

def check_pgb_running(self):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copied the k8s charm interface for consistency.

dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
src/charm.py
Comment on lines +486 to +496
initial_status = self.unit.status
self.unit.status = MaintenanceStatus("Reloading Pgbouncer")
try:
for service in self.pgb_services:
systemd.service_restart(service)
self.unit.status = initial_status
except systemd.SystemdError as e:
logger.error(e)
self.unit.status = BlockedStatus("Failed to restart pgbouncer")

self.unit.status = self.check_status()
self.check_pgb_running()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying to maintain the preexisting status in most cases. Overwriting the status caused problem for blocking on extensions (Blocked status would go away during unit bootup)

dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
src/relations/backend_database.py
Comment on lines +134 to +136
if not self.charm.unit.is_leader() or (
auth_file and self.auth_user and self.auth_user in auth_file
):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are redeploying pgb with a preexisting backend rel, the leader would still be joining even if the relation was already set up.

dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
src/relations/peers.py
Comment on lines +129 to 131
self.update_leader()
if auth_file := self.charm.get_secret(APP_SCOPE, AUTH_FILE_DATABAG_KEY):
self.charm.render_auth_file(auth_file)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we can't trust the secret from start to be up to date, we need to keep on updating the userlist here.

dragomirp
dragomirp commented Mar 24, 2024
View reviewed changes
tests/integration/relations/pgbouncer_provider/test_pgbouncer_provider.py
Comment on lines 367 to 370
@pytest.mark.group(1)
@pytest.mark.unstable
async def test_relation_broken(ops_test: OpsTest):
"""Test that the user is removed when the relation is broken."""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to add the goal state workaround for subordinates to reenable this test.

@dragomirp dragomirp marked this pull request as ready for review March 25, 2024 01:02
marceloneppel
marceloneppel approved these changes Mar 25, 2024
View reviewed changes
Copy link
Member

@marceloneppel marceloneppel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Great work restoring the initial status every time it changes temporarily.

tests/integration/relations/pgbouncer_provider/test_pgbouncer_provider.py
unit_name=unit.name,
relation_id=client_relation.id,
relation_name=FIRST_DATABASE_RELATION_NAME,
dbname=TEST_DBNAME,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice improvement (regarding checking all the units).

taurus-forever
taurus-forever approved these changes Apr 2, 2024
View reviewed changes
Copy link
Contributor

@taurus-forever taurus-forever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent!

@dragomirp dragomirp merged commit 0791812 into main Apr 2, 2024
34 checks passed
@dragomirp dragomirp deleted the dpe-3050-templated-config branch April 2, 2024 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marceloneppel marceloneppel marceloneppel approved these changes

@taurus-forever taurus-forever taurus-forever approved these changes

@lucasgameiroborges lucasgameiroborges Awaiting requested review from lucasgameiroborges

Assignees
No one assigned
Labels
Libraries: OK
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dragomirp @taurus-forever @marceloneppel