Skip to content

Commit 8c8c396

Browse files
author
avandras
committed
Further small adjustments
1 parent d85dbbf commit 8c8c396

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

patroni/multisite.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,13 +282,13 @@ def _resolve_multisite_leader(self):
282282
lock_owner = cluster.leader and cluster.leader.name
283283
# The leader is us
284284
if lock_owner == self.name:
285-
logger.info("Multisite has leader and it is us")
285+
logger.info("Multisite has a leader and it is us")
286286
if self._release:
287287
logger.info("Releasing multisite leader status")
288288
self.dcs.delete_leader(cluster.leader)
289289
self._release = False
290290
self._disconnected_operation()
291-
self._check_transition(leader=False, note="Released multisite leader status on request")
291+
self._check_transition(leader=False, note="Released multisite leader status upon request")
292292
return
293293
if self.dcs.update_leader(cluster, None):
294294
logger.info("Updated multisite leader lease")
@@ -302,7 +302,7 @@ def _resolve_multisite_leader(self):
302302
self._check_transition(leader=False, note="Failed to update multisite leader status")
303303
# Current leader is someone else
304304
else:
305-
logger.info(f"Multisite has leader and it is {lock_owner}")
305+
logger.info(f"Multisite has a leader and it is {lock_owner}")
306306
self._release = False
307307
# Failover successful or someone else took over
308308
if self._failover_target is not None:
@@ -314,12 +314,12 @@ def _resolve_multisite_leader(self):
314314
if not self._has_leader:
315315
self.on_change() # pyright: ignore [reportOptionalCall]
316316
note = (f"Lost leader lock to {lock_owner}" if self._has_leader else
317-
f"Current leader {lock_owner}")
317+
f"Current leader is {lock_owner}")
318318
self._check_transition(leader=False, note=note)
319319

320320
except DCSError as e:
321321
logger.error(f"Error accessing multisite DCS: {e}")
322-
self._dcs_error = 'Multi site DCS cannot be reached'
322+
self._dcs_error = 'Multisite DCS cannot be reached'
323323
if self._has_leader:
324324
self._disconnected_operation()
325325
self._has_leader = False
@@ -341,7 +341,7 @@ def _observe_leader(self):
341341
cluster = self.dcs.get_cluster()
342342

343343
if cluster.is_unlocked():
344-
logger.info("Multisite has no leader because cluster is unlocked")
344+
logger.info("Multisite has no leader because the cluster is unlocked")
345345
self._disconnected_operation()
346346
else:
347347
# There is a leader cluster
@@ -464,7 +464,7 @@ def state_transition(self, new_state: str, note: str):
464464
failover_time = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
465465
reason = 'Promote' if new_state == 'Leader' else 'Demote'
466466
if note == '':
467-
note = 'Acquired multisite leader' if new_state == 'Leader' else 'Became a standby cluster'
467+
note = 'Acquired multisite leader lock' if new_state == 'Leader' else 'Became a standby site'
468468

469469
self._event_obj = kubernetes.client.EventsV1Event(
470470
action='Failover',

0 commit comments

Comments
 (0)