[MISC] Suppress oversee users in standby clusters #507
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #507 +/- ##
==========================================
- Coverage 69.78% 69.72% -0.07%
==========================================
Files 11 11
Lines 2866 2870 +4
Branches 507 508 +1
==========================================
+ Hits 2000 2001 +1
- Misses 761 763 +2
- Partials 105 106 +1 ☔ View full report in Codecov by Sentry. |
dragomirp
force-pushed
the
suppress-oversee-user
branch
from
187bb8e to
8e9d9ee
Compare
dragomirp
force-pushed
the
suppress-oversee-user
branch
from
911a659 to
ba1a260
Compare
dragomirp
force-pushed
the
suppress-oversee-user
branch
from
fd8a477 to
9bafcf6
Compare
dragomirp
commented
Jun 25, 2024
| @@ -481,7 +482,7 @@ def is_primary_cluster(self) -> bool: | |||
| return self.charm.app == self._get_primary_cluster() | |||
|
|
|||
| def _on_async_relation_broken(self, _) -> None: | |||
| if "departing" in self.charm._peers.data[self.charm.unit]: | |||
| if not self.charm._peers or "departing" in self.charm._peers.data[self.charm.unit]: | |||
There was a problem hiding this comment.
Seen it fail in CI.
dragomirp
commented
Jun 25, 2024
Comment on lines
+231
to
+243
| @pytest.mark.group(1) | ||
| @markers.juju3 | ||
| @pytest.mark.abort_on_fail | ||
| async def test_get_data_integrator_credentials( | ||
| ops_test: OpsTest, | ||
| ): | ||
| unit = ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].units[0] | ||
| action = await unit.run_action(action_name="get-credentials") | ||
| result = await action.wait() | ||
| global data_integrator_credentials | ||
| data_integrator_credentials = result.results | ||
|
|
||
|
|
There was a problem hiding this comment.
Just gets the credentials from data integrator.
dragomirp
commented
Jun 25, 2024
| @@ -193,6 +193,7 @@ def _configure_standby_cluster(self, event: RelationChangedEvent) -> bool: | |||
| filename = f"{POSTGRESQL_DATA_PATH}-{str(datetime.now()).replace(' ', '-').replace(':', '-')}.tar.gz" | |||
| subprocess.check_call(f"tar -zcf {filename} {POSTGRESQL_DATA_PATH}".split()) | |||
| logger.warning("Please review the backup file %s and handle its removal", filename) | |||
| self.charm.app_peer_data["suppress-oversee-users"] = "true" | |||
There was a problem hiding this comment.
Set a flag when a cluster is made a standby
dragomirp
commented
Jun 25, 2024
Comment on lines
+140
to
+141
| delete_user = "suppress-oversee-users" not in self.charm.app_peer_data | ||
|
|
There was a problem hiding this comment.
If the cluster is or was a standby, it will stop deleting relation users.
|
Currently there's no way to clear up the flag. Action to clear it up was moved to #509 |
dragomirp
requested review from
marceloneppel,
taurus-forever and
lucasgameiroborges
marceloneppel
approved these changes
Jun 25, 2024
taurus-forever
approved these changes
Jun 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stop deleting managed users without a relation. This is necessary to keep all credentials working when there is a switchover to standby cluster.