Skip to content

Commit 412d0a6

Browse files
author
avandras
committed
Address further type checking issues
1 parent f772966 commit 412d0a6

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

patroni/multisite.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def _resolve_multisite_leader(self):
212212
self._release = False
213213
self._disconnected_operation()
214214
return
215-
if self._failover_target and self._failover_timeout > time.time():
215+
if self._failover_target and self._failover_timeout and self._failover_timeout > time.time():
216216
logger.info("Waiting for multisite failover to complete")
217217
self._disconnected_operation()
218218
return
@@ -265,12 +265,13 @@ def _resolve_multisite_leader(self):
265265
if self._failover_target is not None:
266266
self._failover_target = None
267267
self._failover_timeout = None
268-
if self._set_standby_config(cluster.leader.member):
268+
if self._set_standby_config(cluster.leader.member): # pyright: ignore [reportOptionalMemberAccess]
269269
# Wake up anyway to notice that we need to replicate from new leader. For the other case
270270
# _check_transition() handles the wake.
271271
if not self._has_leader:
272-
self.on_change()
273-
note = f"Lost leader lock to {lock_owner}" if self._has_leader else f"Current leader {lock_owner}"
272+
self.on_change() # pyright: ignore [reportOptionalCall]
273+
note = (f"Lost leader lock to {lock_owner}" if self._has_leader else
274+
f"Current leader {lock_owner}")
274275
self._check_transition(leader=False, note=note)
275276

276277
except DCSError as e:
@@ -279,7 +280,7 @@ def _resolve_multisite_leader(self):
279280
if self._has_leader:
280281
self._disconnected_operation()
281282
self._has_leader = False
282-
self.on_change()
283+
self.on_change() # pyright: ignore [reportOptionalCall]
283284
if self._state_updater:
284285
self._state_updater.state_transition('Standby', 'Unable to access multisite DCS')
285286
else:
@@ -309,7 +310,7 @@ def _observe_leader(self):
309310
self._standby_config = None
310311
else:
311312
logger.info(f"Multisite leader is {lock_owner}")
312-
self._set_standby_config(cluster.leader.member)
313+
self._set_standby_config(cluster.leader.member) # pyright: ignore [reportOptionalMemberAccess]
313314
except DCSError as e:
314315
# On replicas we need to know the multisite status only for rewinding.
315316
logger.warning(f"Error accessing multisite DCS: {e}")

0 commit comments

Comments
 (0)