Apply suggestions from code review

This commit is contained in:
Polina Bungina
2023-08-27 20:19:00 +02:00
parent 7606df7196
commit 293c1e4cd3
+8 -6
View File
@@ -1256,10 +1256,12 @@ def _do_failover_or_switchover(obj: Dict[str, Any], action: str, cluster_name: s
raise PatroniCtlException(
f'Member {candidate} does not exist in cluster {cluster_name} or is tagged as nofailover')
if not force and action == 'failover':
if global_config.is_synchronous_mode and not cluster.sync.is_empty\
and not cluster.sync.matches(candidate, True)\
and not click.confirm(f'Are you sure you want to failover to the asynchronous node {candidate}'):
if all((not force,
action == 'failover',
global_config.is_synchronous_mode,
not cluster.sync.is_empty,
not cluster.sync.matches(candidate, True))):
if click.confirm(f'Are you sure you want to failover to the asynchronous node {candidate}'):
raise PatroniCtlException('Aborting ' + action)
scheduled_at_str = None
@@ -1290,8 +1292,8 @@ def _do_failover_or_switchover(obj: Dict[str, Any], action: str, cluster_name: s
demote_msg = f', demoting current leader {cluster.leader.name}' if cluster.leader else ''
if scheduled_at_str:
# only switchover can be scheduled
if not click.confirm(f'Are you sure you want to schedule switchover of cluster \
{cluster_name} at {scheduled_at_str}{demote_msg}?'):
if not click.confirm(f'Are you sure you want to schedule switchover of cluster'
f'{cluster_name} at {scheduled_at_str}{demote_msg}?'):
raise PatroniCtlException('Aborting scheduled ' + action)
else:
if not click.confirm(f'Are you sure you want to {action} cluster {cluster_name}{demote_msg}?'):