openstack/sunbeam-charms
Code Issues Proposed changes

[tempest-k8s] Fix error on remove-application

Browse Source 
Previously on application remove,
tempest-k8s charm would error at the relation-broken hook,
causing the removal to fail:

```
tempest/0*                   error        idle       10.1.169.40         hook failed: "identity-ops-relation-broken"
```

with traceback:

```
  File "/var/lib/juju/agents/unit-tempest-0/charm/src/handlers.py", line 609, in _on_provider_goneaway
    self.charm.set_tempest_ready(False)
  File "/var/lib/juju/agents/unit-tempest-0/charm/./src/charm.py", line 283, in set_tempest_ready
    self.peers.set_unit_data({TEMPEST_READY_KEY: "true" if ready else ""})
  File "/var/lib/juju/agents/unit-tempest-0/charm/lib/ops_sunbeam/relation_handlers.py", line 625, in set_unit_data
    self.interface.set_unit_data(settings)
  File "/var/lib/juju/agents/unit-tempest-0/charm/lib/ops_sunbeam/interfaces.py", line 150, in set_unit_data
    self.peers_rel.data[self.model.unit][k] = v
AttributeError: 'NoneType' object has no attribute 'data'
```

This fixes the issue for tempest (and potentially if similar issues
are present on other sunbeam charms),
by checking if peels_rel exists because trying to interact with it.

Change-Id: I5e01c1dba719a63160f0452282d57b9eae14b41b
This commit is contained in:
Samuel Allan
2024-05-15 14:32:46 +02:00
parent 0cca8980ef
commit 539f36817f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ops-sunbeam/ops_sunbeam/interfaces.py
View File

@@ -84,7 +84,7 @@ class OperatorPeers(Object):
) )
@property @property
def peers_rel(self) -> ops.model.Relation: def peers_rel(self) -> ops.model.Relation | None:
"""Peer relation.""" """Peer relation."""
return self.framework.model.get_relation(self.relation_name) return self.framework.model.get_relation(self.relation_name)
@@ -146,11 +146,15 @@ class OperatorPeers(Object):
def set_unit_data(self, settings: Dict[str, str]) -> None: def set_unit_data(self, settings: Dict[str, str]) -> None:
"""Publish settings on the peer unit data bag.""" """Publish settings on the peer unit data bag."""
if not self.peers_rel:
return
for k, v in settings.items(): for k, v in settings.items():
self.peers_rel.data[self.model.unit][k] = v self.peers_rel.data[self.model.unit][k] = v
def all_joined_units(self) -> List[ops.model.Unit]: def all_joined_units(self) -> List[ops.model.Unit]:
"""All remote units joined to the peer relation.""" """All remote units joined to the peer relation."""
if not self.peers_rel:
return []
return set(self.peers_rel.units) return set(self.peers_rel.units)
def expected_peer_units(self) -> int: def expected_peer_units(self) -> int:
@@ -158,4 +162,6 @@ class OperatorPeers(Object):
NOTE: This count includes this unit NOTE: This count includes this unit
""" """
if not self.peers_rel:
return 0
return self.peers_rel.app.planned_units() return self.peers_rel.app.planned_units()