Skip to content

Commit

Permalink
Attempt to stabilize exporter tests in light of bind-address in use i…
Browse files Browse the repository at this point in the history
…ssues (#154)

Counterpart of
canonical/mysql-router-k8s-operator#254

## Summary
1. Use `requests.get(stream=False)` to avoid open connections on the
router exporter
2. Split the two exporter tests into different files so that they end up
in different integration test groups
3. Use a much larger timeout (7mins) that the TIME_WAIT timeout
(60s/1min) to see if the snap daemon (mysql-router-exporter) will
restart successfully
  • Loading branch information
shayancanonical authored Jul 16, 2024
1 parent b12dcee commit 3c48ce8
Show file tree
Hide file tree
Showing 7 changed files with 554 additions and 259 deletions.
25 changes: 24 additions & 1 deletion lib/charms/data_platform_libs/v0/data_interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def _on_topic_requested(self, event: TopicRequestedEvent):

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 37
LIBPATCH = 38

PYDEPS = ["ops>=2.0.0"]

Expand Down Expand Up @@ -2606,6 +2606,14 @@ def set_version(self, relation_id: int, version: str) -> None:
"""
self.update_relation_data(relation_id, {"version": version})

def set_subordinated(self, relation_id: int) -> None:
"""Raises the subordinated flag in the application relation databag.
Args:
relation_id: the identifier for a particular relation.
"""
self.update_relation_data(relation_id, {"subordinated": "true"})


class DatabaseProviderEventHandlers(EventHandlers):
"""Provider-side of the database relation handlers."""
Expand Down Expand Up @@ -2842,6 +2850,21 @@ def _on_relation_created_event(self, event: RelationCreatedEvent) -> None:

def _on_relation_changed_event(self, event: RelationChangedEvent) -> None:
"""Event emitted when the database relation has changed."""
is_subordinate = False
remote_unit_data = None
for key in event.relation.data.keys():
if isinstance(key, Unit) and not key.name.startswith(self.charm.app.name):
remote_unit_data = event.relation.data[key]
elif isinstance(key, Application) and key.name != self.charm.app.name:
is_subordinate = event.relation.data[key].get("subordinated") == "true"

if is_subordinate:
if not remote_unit_data:
return

if remote_unit_data.get("state") != "ready":
return

# Check which data has changed to emit customs events.
diff = self._diff(event)

Expand Down
Loading

0 comments on commit 3c48ce8

Please sign in to comment.