Fix pgautofailover.update_secondary_check() for dropped nodes. (#755)

hapostgres · Jul 6, 2021 · c962167 · c962167
1 parent 0556bf1
commit c962167
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/monitor/pgautofailover--1.5--1.6.sql b/src/monitor/pgautofailover--1.5--1.6.sql
@@ -431,7 +431,8 @@ begin
 		  into nodeid, reportedstate
 		  from pgautofailover.node
 		 where node.formationid = new.formationid
-		   and node.reportedstate <> 'single';
+		   and node.reportedstate <> 'single'
+           and node.goalstate <> 'dropped';
 
 		if nodeid is not null
 		then

diff --git a/src/monitor/pgautofailover.sql b/src/monitor/pgautofailover.sql
@@ -730,7 +730,8 @@ begin
 		  into nodeid, reportedstate
 		  from pgautofailover.node
 		 where node.formationid = new.formationid
-		   and node.reportedstate <> 'single';
+		   and node.reportedstate <> 'single'
+           and node.goalstate <> 'dropped';
 
 		if nodeid is not null
 		then

diff --git a/tests/pgautofailover_utils.py b/tests/pgautofailover_utils.py
@@ -1819,7 +1819,9 @@ def print_state(self, formation="default"):
         print("pg_autoctl show state --pgdata %s" % self.datadir)
 
         command = PGAutoCtl(self)
-        out, err, ret = command.execute("show state", "show", "state")
+        out, err, ret = command.execute(
+            "show state", "show", "state", "--formation", formation
+        )
         print("%s" % out)
 
     def get_other_nodes(self, nodeid):