Skip to content

Commit 68dbb06

Browse files
committed
don't set readonly node priority at update config.
correct_password dont exit.
1 parent 66a0533 commit 68dbb06

File tree

1 file changed

+8
-5
lines changed
  • platforms/kubernetes/postgres-operator/postgres

1 file changed

+8
-5
lines changed

platforms/kubernetes/postgres-operator/postgres/handle.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -2860,8 +2860,11 @@ def correct_postgresql_password(
28602860
readwrite_conns = connections(spec, meta, patch,
28612861
get_field(POSTGRESQL, READWRITEINSTANCE),
28622862
False, None, logger, None, status, False)
2863-
conn = get_primary_conn(readwrite_conns, 0, logger)
2864-
correct_user_password(meta, spec, patch, status, logger, conn)
2863+
conn = get_primary_conn(readwrite_conns, 0, logger, interrupt = False)
2864+
if conn == None:
2865+
logger.error(f"can't correct readwrite password. because get primary conn failed")
2866+
else:
2867+
correct_user_password(meta, spec, patch, status, logger, conn)
28652868
readwrite_conns.free_conns()
28662869

28672870

@@ -2967,8 +2970,8 @@ def timer_cluster(
29672970
) -> None:
29682971

29692972
correct_postgresql_role(meta, spec, patch, status, logger)
2970-
correct_postgresql_password(meta, spec, patch, status, logger)
29712973
correct_keepalived(meta, spec, patch, status, logger)
2974+
correct_postgresql_password(meta, spec, patch, status, logger)
29722975

29732976
def update_number_sync_standbys(
29742977
meta: kopf.Meta,
@@ -3530,7 +3533,7 @@ def update_configs_utile(
35303533
# pg_autoctl set node candidate-priority 0 --pgdata=s
35313534

35323535
if autofailover == False and restart == True:
3533-
update_node_priority(meta, spec, patch, status, logger, conns, NODE_PRIORITY_NEVER, primary_host)
3536+
update_node_priority(meta, spec, patch, status, logger, readwrite_conns.get_conns(), NODE_PRIORITY_NEVER, primary_host)
35343537

35353538
# first update primary node
35363539
checkpoint_cmd = ["pgtools", "-w", "0", "-q", "'checkpoint'"]
@@ -3583,7 +3586,7 @@ def update_configs_utile(
35833586
waiting_postgresql_ready(readonly_conns, logger)
35843587
waiting_cluster_final_status(meta, spec, patch, status, logger)
35853588
if autofailover == False and restart == True:
3586-
update_node_priority(meta, spec, patch, status, logger, conns, NODE_PRIORITY_DEFAULT, primary_host)
3589+
update_node_priority(meta, spec, patch, status, logger, readwrite_conns.get_conns(), NODE_PRIORITY_DEFAULT, primary_host)
35873590
waiting_cluster_final_status(meta, spec, patch, status, logger)
35883591

35893592
def update_configs_port(

0 commit comments

Comments
 (0)