gitops/patroni
1
0
Fork 0
mirror of https://github.com/outbackdingo/patroni.git synced 2026-08-25 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review 2

Browse Source
This commit is contained in:
Polina Bungina
2023-07-31 17:09:19 +02:00
parent 3e96e89e8b
commit 17a139f890
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patroni/ctl.py
+1 -2
View File
@@ -1383,8 +1383,7 @@ def switchover(obj: Dict[str, Any], cluster_name: str, group: Optional[int],
:param force: perform the switchover without asking for confirmations.
:param scheduled: timestamp when the switchover should be scheduled to occur. If ``now`` perform immediately.
"""
_do_failover_or_switchover(obj, 'switchover', cluster_name, group, candidate, force,
leader=leader, scheduled=scheduled)
_do_failover_or_switchover(obj, 'switchover', cluster_name, group, candidate, force, leader, scheduled)
def generate_topology(level: int, member: Dict[str, Any],
patroni/ha.py
+7 -10
View File
@@ -1205,13 +1205,10 @@ class Ha(object):
if not failover.candidate and self.is_paused():
logger.warning('%s is possible only to a specific candidate in a paused state', action.title())
else:
if self.is_synchronous_mode():
members = self.get_failover_candidates()
if failover.candidate and not members:
logger.warning('%s candidate=%s does not match with sync_standbys=%s',
action.title(), failover.candidate, self.cluster.sync.sync_standby)
else:
members = self.get_failover_candidates(check_sync=False)
members = self.get_failover_candidates(check_sync=self.is_synchronous_mode())
if failover.candidate and not members:
logger.warning('%s candidate=%s does not match with sync_standbys=%s',
action.title(), failover.candidate, self.cluster.sync.sync_standby)
if self.is_failover_possible(members): # check that there are healthy members
ret = self._async_executor.try_run_async(f'manual {action}: demote', self.demote, ('graceful',))
return ret or f'manual {action}: demoting myself'
@@ -1940,7 +1937,7 @@ class Ha(object):
:param check_sync: if ``True``, also check against the sync key members
:returns: a list of ``Member`` ojects or an empty list if there is no candidate available.
Never includes the current node, as its checks always performed earlier.
Never includes the current node, as its checks are always performed earlier.
"""
failover = self.cluster.failover
if check_sync and self.is_synchronous_mode() and not self.cluster.sync.is_empty:
@@ -1951,8 +1948,8 @@ class Ha(object):
else:
# the candidate if is in /sync members for a candidate failover, every /sync member otherwise
return [m for m in self.cluster.members if self.cluster.sync.matches(m.name)
and (not failover or not failover.candidate or m.name == failover.candidate
and m.name != self.state_handler.name)]
and (not failover or not failover.candidate or m.name == failover.candidate)
and m.name != self.state_handler.name]
# the candidate for a candidate failover, every cluster member otherwise
return [m for m in self.cluster.members
if (not failover or not failover.candidate or m.name == failover.candidate)