[DPE-6484] Add scope to promote to primary #850

dragomirp · 2025-02-06T11:28:48Z

Update the promote-to-primary action to accept scope and promote units.

codecov · 2025-02-06T11:29:50Z

Codecov Report

Attention: Patch coverage is 76.00000% with 6 lines in your changes missing coverage. Please review.

Project coverage is 75.45%. Comparing base (842aa47) to head (8ab236a).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
src/charm.py	76.47%	2 Missing and 2 partials ⚠️
src/patroni.py	71.42%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #850      +/-   ##
==========================================
- Coverage   75.48%   75.45%   -0.03%     
==========================================
  Files          12       12              
  Lines        3157     3178      +21     
  Branches      471      475       +4     
==========================================
+ Hits         2383     2398      +15     
- Misses        632      635       +3     
- Partials      142      145       +3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

dragomirp · 2025-02-06T22:47:58Z

actions.yaml

  params:
+    scope:
+      type: string
+      default: unit


Assuming default unit, based on proposal in DA139. Will set to the current status of DA139 after the stable release.

dragomirp · 2025-02-07T12:43:17Z

src/patroni.py

+        if not wait:
+            return


When running the action we shouldn't wait for the switchover itself to happen.

dragomirp · 2025-02-07T12:44:01Z

src/patroni.py


        # Check whether the switchover was unsuccessful.
        if r.status_code != 200:
+            logger.warning(f"Switchover call failed with code {r.status_code} {r.text}")


Log Patroni's error code, the body should contain the reason.

dragomirp · 2025-02-07T12:45:41Z

src/charm.py

+    def promote_primary_unit(self, event: ActionEvent) -> None:
+        """Handles promote to primary for unit scope."""
+        if event.params.get("force"):
+            event.fail("Suprerfluous force flag with unit scope")


No RAFT, so no need to force.

lucasgameiroborges · 2025-02-07T14:47:56Z

src/charm.py

+            try:
+                self._patroni.switchover(self.unit.name, wait=False)
+            except SwitchoverFailedError:
+                event.fail("Switchover failed or timed out, check the logs for details")


If wait=False, can this catched error be due to time out at all? (as implied by the error message)

lucasgameiroborges

LGTM

taurus-forever

LGTM to sync VM with K8s.
IMHO we should discuss promote-to-primary => promote-unit/cluster.

* try using pg 16 rock * try fix integration tests * remove argument on helper * more fixes * fix test issues * REVERT LATER: Adapt build_charm function * remove base=CHARM_BASE from deploy * remove juju 2.9 tests * grat permissions to public schema * fix linting and unit test * try refactor the permissions change * Update dependency uv to v0.5.27 (#847) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * grant public access to public schemas * [DPE-6053] Fix ports (#846) * Fix ports Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Remove unused import Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Remove unused charm library and fix unit tests Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Fix identation Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Bump libs * Conditional set_ports logic * Unit test * Don't expect juju managed resources --------- Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> Co-authored-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * mark smoke test as unstable * test release charm to 16/edge * fix test release workflow * fix typo * Sync docs from Discourse (#801) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> * Update dependency uv to v0.5.29 (#848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Define charm utility properties (#842) * Update data-platform-workflows to v29.1.0 (#849) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * revert metadata.yaml * nits * Use `charmcraft test` & concierge (#852) * [MISC] Split topology script (#853) * Update charmcraft.yaml build tools (#851) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency uv to v0.5.31 (#858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v30 (#859) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use _promote_charm.yaml (#860) Use `charmcraft promote` and auto-generate release notes * Update dependency cryptography to v44.0.1 [SECURITY] (#855) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Sync docs from Discourse (#854) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> * Update data-platform-workflows to v30.0.2 (#863) * Update canonical/has-signed-canonical-cla action to v2 (#865) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [DPE-5827] Set all nodes to synchronous replicas (#784) * Update patroni configuration * Update test assertion * Copy update_synchronous_node_count from VM * Add unit test * Set sync node count during upgrade * Fix tls test * Switchover primary * Add different helper to get leader * Add config boilerplate * Use config value when setting sync node count * Escape tuple * Add policy values * Add integration test * Fix casting * Fix test * Update to spec * Bump retry timout * Switch to planned units * Fix generator * Update conf description * Spread task * Pass the charm * [DPE-6484] Add scope to promote to primary (#850) * Promote unit action * Tweaks for failing REST calls * VM parity * [MISC] Enable RBAC in tests (#861) * Enable RBAC * Bump cosl * Add trust * Bump libs * [MISC] Define charm constants (#862) * Lock file maintenance Python dependencies (#835) * Lock file maintenance Python dependencies * Backoff boto3 1.36 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dragomir Penev <dragomir.penev@canonical.com> * Update canonical/data-platform-workflows action to v30.1.3 (#856) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update charmcraft.yaml build tools (#868) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Handle missing stanza output (#866) * Update ghcr.io/canonical/charmed-postgresql:14.15-22.04_edge Docker digest to 71d49b6 (#870) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Disable storage test on arm (#872) * Disable storage test on Arm * Bump libs * Correct import path * Update charmcraft.yaml build tools (#871) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Add degraded status to primary message (#874) * Add degraded status on to primary message * Use const running tests * [MISC] Sanitize PostgreSQL extra-user-roles arg (#876) * [MISC] Fix PostgreSQL lib function signature (#879) * [MISC] Skip backup tests without creds (#884) * Bump libs * Skip backups tests if no creds are set * Check that the cloud config is set to a value * Typo * Update tests/integration/conftest.py Co-authored-by: Carl Csaposs <carl.csaposs@canonical.com> * Switch all checks to gets * Typo --------- Co-authored-by: Carl Csaposs <carl.csaposs@canonical.com> * [DPE-6679] PostgreSQL Config Improvement (#867) * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * Update dependency jinja2 to v3.1.6 [SECURITY] (#882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v30.2.0 (#887) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Reduce required approvals on Renovate pull requests by 1 (#880) * Update dependency uv to v0.6.5 (#878) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Don't run juju2 and legacy tests * Use correct charm * Dual branch config * Remove 14 specific tests * Remove eer data secrets * Skip upgrade from stable * Upgrade on Noble * Build and deploy noble * Linting * Disable pgaudit during tests * Linting * Use common deploy for smoke test * Tweaks * Remove legacy rels * Tweak tests * Cleanup markers * Deploy without pgaudit in plugin tests * Update ghcr.io/canonical/charmed-postgresql Docker tag to v14.17 (#877) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Correct remove relation * Bump rock * Remove check for port forwarding --------- Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> Co-authored-by: Lucas Gameiro Borges <lucas.borges@canonical.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dragomir Penev <6687393+dragomirp@users.noreply.github.com> Co-authored-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Sinclert Pérez <sinclert.perez@canonical.com> Co-authored-by: lucas.gameiro-borges <lucas.gameiro-borges@student-cs.fr> Co-authored-by: Carl Csaposs <carl.csaposs@canonical.com> Co-authored-by: Dragomir Penev <dragomir.penev@canonical.com> Co-authored-by: Danylo Bereznenko <pepsiqqfanta@gmail.com>

* Update dependency uv to v0.5.27 (#847) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [DPE-6053] Fix ports (#846) * Fix ports Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Remove unused import Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Remove unused charm library and fix unit tests Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Fix identation Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Bump libs * Conditional set_ports logic * Unit test * Don't expect juju managed resources --------- Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> Co-authored-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> * Sync docs from Discourse (#801) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> * Update dependency uv to v0.5.29 (#848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Define charm utility properties (#842) * Update data-platform-workflows to v29.1.0 (#849) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use `charmcraft test` & concierge (#852) * [MISC] Split topology script (#853) * Update charmcraft.yaml build tools (#851) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency uv to v0.5.31 (#858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v30 (#859) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use _promote_charm.yaml (#860) Use `charmcraft promote` and auto-generate release notes * Update dependency cryptography to v44.0.1 [SECURITY] (#855) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Sync docs from Discourse (#854) Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> * Update data-platform-workflows to v30.0.2 (#863) * Update canonical/has-signed-canonical-cla action to v2 (#865) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [DPE-5827] Set all nodes to synchronous replicas (#784) * Update patroni configuration * Update test assertion * Copy update_synchronous_node_count from VM * Add unit test * Set sync node count during upgrade * Fix tls test * Switchover primary * Add different helper to get leader * Add config boilerplate * Use config value when setting sync node count * Escape tuple * Add policy values * Add integration test * Fix casting * Fix test * Update to spec * Bump retry timout * Switch to planned units * Fix generator * Update conf description * Spread task * Pass the charm * [DPE-6484] Add scope to promote to primary (#850) * Promote unit action * Tweaks for failing REST calls * VM parity * [MISC] Enable RBAC in tests (#861) * Enable RBAC * Bump cosl * Add trust * Bump libs * [MISC] Define charm constants (#862) * Lock file maintenance Python dependencies (#835) * Lock file maintenance Python dependencies * Backoff boto3 1.36 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dragomir Penev <dragomir.penev@canonical.com> * Update canonical/data-platform-workflows action to v30.1.3 (#856) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update charmcraft.yaml build tools (#868) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Handle missing stanza output (#866) * Update ghcr.io/canonical/charmed-postgresql:14.15-22.04_edge Docker digest to 71d49b6 (#870) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Disable storage test on arm (#872) * Disable storage test on Arm * Bump libs * Correct import path * Update charmcraft.yaml build tools (#871) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [MISC] Add degraded status to primary message (#874) * Add degraded status on to primary message * Use const running tests * [MISC] Sanitize PostgreSQL extra-user-roles arg (#876) * [MISC] Fix PostgreSQL lib function signature (#879) * [MISC] Skip backup tests without creds (#884) * Bump libs * Skip backups tests if no creds are set * Check that the cloud config is set to a value * Typo * Update tests/integration/conftest.py Co-authored-by: Carl Csaposs <carl.csaposs@canonical.com> * Switch all checks to gets * Typo --------- Co-authored-by: Carl Csaposs <carl.csaposs@canonical.com> * [DPE-6679] PostgreSQL Config Improvement (#867) * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * config improvement * Update dependency jinja2 to v3.1.6 [SECURITY] (#882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v30.2.0 (#887) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Reduce required approvals on Renovate pull requests by 1 (#880) * Update dependency uv to v0.6.5 (#878) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update ghcr.io/canonical/charmed-postgresql Docker tag to v14.17 (#877) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency uv to v0.6.7 (#890) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update canonical/data-platform-workflows action to v31 (#891) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Try the new timescale * Check PR on */edge * Enable cache, disable pgaudit * Use the right base * Arm tests --------- Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Sinclert Pérez <sinclert.perez@canonical.com> Co-authored-by: Carl Csaposs <carl.csaposs@canonical.com> Co-authored-by: Danylo Bereznenko <pepsiqqfanta@gmail.com>

Promote unit action

e0e3bba

github-actions bot added the Libraries: Out of sync label Feb 6, 2025

Tweaks for failing REST calls

ced2bc0

dragomirp commented Feb 6, 2025

View reviewed changes

dragomirp commented Feb 7, 2025

View reviewed changes

dragomirp marked this pull request as ready for review February 7, 2025 12:47

dragomirp requested review from a team, taurus-forever, marceloneppel and lucasgameiroborges and removed request for a team February 7, 2025 12:47

lucasgameiroborges reviewed Feb 7, 2025

View reviewed changes

lucasgameiroborges approved these changes Feb 7, 2025

View reviewed changes

marceloneppel approved these changes Feb 7, 2025

View reviewed changes

Merge branch 'main' into dpe-6484-promote-scope

11ebf5b

dragomirp added the enhancement New feature, UI change, or workload upgrade label Feb 14, 2025

dragomirp added 2 commits February 14, 2025 11:26

VM parity

d287454

Merge branch 'main' into dpe-6484-promote-scope

8ab236a

taurus-forever approved these changes Feb 19, 2025

View reviewed changes

dragomirp merged commit c9f6554 into main Feb 19, 2025
96 checks passed

dragomirp deleted the dpe-6484-promote-scope branch February 19, 2025 11:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[DPE-6484] Add scope to promote to primary #850

[DPE-6484] Add scope to promote to primary #850

Uh oh!

dragomirp commented Feb 6, 2025 •

edited

Loading

Uh oh!

codecov bot commented Feb 6, 2025 •

edited

Loading

Uh oh!

dragomirp Feb 6, 2025 •

edited

Loading

Uh oh!

dragomirp Feb 7, 2025

Uh oh!

dragomirp Feb 7, 2025

Uh oh!

dragomirp Feb 7, 2025

Uh oh!

lucasgameiroborges Feb 7, 2025

Uh oh!

lucasgameiroborges left a comment

Uh oh!

taurus-forever left a comment

Uh oh!

Uh oh!

Uh oh!

[DPE-6484] Add scope to promote to primary #850

[DPE-6484] Add scope to promote to primary #850

Uh oh!

Conversation

dragomirp commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dragomirp Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dragomirp Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

dragomirp Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

dragomirp Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

lucasgameiroborges Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

lucasgameiroborges left a comment

Choose a reason for hiding this comment

Uh oh!

taurus-forever left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dragomirp commented Feb 6, 2025 •

edited

Loading

codecov bot commented Feb 6, 2025 •

edited

Loading

dragomirp Feb 6, 2025 •

edited

Loading