Skip to content

Commit fe59054

Browse files
committed
handling different versions of Postgres of unit
1 parent a177921 commit fe59054

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/charm.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -468,10 +468,6 @@ def _on_peer_relation_changed(self, event: HookEvent):
468468
if self.unit.is_leader() and not self._reconfigure_cluster(event):
469469
event.defer()
470470
return
471-
#
472-
# if not self._validate_database_version(self._patroni.get_postgresql_version()):
473-
# self.unit.status = BlockedStatus(DIFFERENT_VERSIONS_PSQL_BLOCKING_MESSAGE)
474-
# return
475471

476472
if self._update_member_ip():
477473
return
@@ -526,6 +522,8 @@ def _on_peer_relation_changed(self, event: HookEvent):
526522

527523
self._update_new_unit_status()
528524

525+
self._validate_database_version()
526+
529527
# Split off into separate function, because of complexity _on_peer_relation_changed
530528
def _start_stop_pgbackrest_service(self, event: HookEvent) -> None:
531529
# Start or stop the pgBackRest TLS server service when TLS certificate change.
@@ -1584,15 +1582,17 @@ def client_relations(self) -> List[Relation]:
15841582
relations.append(relation)
15851583
return relations
15861584

1587-
def _validate_database_version(self, version: str) -> bool:
1585+
def _validate_database_version(self):
15881586
"""Checking that only one version of Postgres is used."""
15891587
peer_db_version = self.app_peer_data.get("database-version")
15901588

15911589
if self.unit.is_leader() and peer_db_version is None:
1592-
self.app_peer_data.update({"database-version": version})
1593-
return True
1590+
self.app_peer_data.update({"database-version": self._patroni.get_postgresql_version()})
1591+
return
15941592

1595-
return peer_db_version == self._patroni.get_postgresql_version()
1593+
if peer_db_version != self._patroni.get_postgresql_version():
1594+
self.unit.status = BlockedStatus(DIFFERENT_VERSIONS_PSQL_BLOCKING_MESSAGE)
1595+
return
15961596

15971597

15981598
if __name__ == "__main__":

0 commit comments

Comments
 (0)