]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Remove WaitPMResult enum in pg_createsubscriber
authorÁlvaro Herrera <alvherre@kurilemu.de>
Mon, 3 Nov 2025 11:59:32 +0000 (12:59 +0100)
committerÁlvaro Herrera <alvherre@kurilemu.de>
Mon, 3 Nov 2025 11:59:32 +0000 (12:59 +0100)
A simple boolean suffices.  This is cosmetic, so no backpatch.

Author: Álvaro Herrera <alvherre@kurilemu.de>
Discussion: https://postgr.es/m/202510311750.mxiykx3tp4mx@alvherre.pgsql

src/bin/pg_basebackup/pg_createsubscriber.c

index f59c293d875da4c84041710646822517f3a62822..61175453c90972eee744dfcad7d312664bc6819c 100644 (file)
@@ -156,12 +156,6 @@ static char *subscriber_dir = NULL;
 static bool recovery_ended = false;
 static bool standby_running = false;
 
-enum WaitPMResult
-{
-       POSTMASTER_READY,
-       POSTMASTER_STILL_STARTING
-};
-
 
 /*
  * Cleanup objects that were created by pg_createsubscriber if there is an
@@ -1584,7 +1578,7 @@ static void
 wait_for_end_recovery(const char *conninfo, const struct CreateSubscriberOptions *opt)
 {
        PGconn     *conn;
-       int                     status = POSTMASTER_STILL_STARTING;
+       bool            ready = false;
        int                     timer = 0;
 
        pg_log_info("waiting for the target server to reach the consistent state");
@@ -1596,7 +1590,7 @@ wait_for_end_recovery(const char *conninfo, const struct CreateSubscriberOptions
                /* Did the recovery process finish? We're done if so. */
                if (dry_run || !server_is_in_recovery(conn))
                {
-                       status = POSTMASTER_READY;
+                       ready = true;
                        recovery_ended = true;
                        break;
                }
@@ -1617,7 +1611,7 @@ wait_for_end_recovery(const char *conninfo, const struct CreateSubscriberOptions
 
        disconnect_database(conn, false);
 
-       if (status == POSTMASTER_STILL_STARTING)
+       if (!ready)
                pg_fatal("server did not end recovery");
 
        pg_log_info("target server reached the consistent state");