agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v14 4/8] Row pattern recognition patch (planner). 210+ messages / 2 participants [nested] [flat]
* [PATCH v14 4/8] Row pattern recognition patch (planner). @ 2024-02-28 13:59 Tatsuo Ishii <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Tatsuo Ishii @ 2024-02-28 13:59 UTC (permalink / raw) --- src/backend/optimizer/plan/createplan.c | 24 +++++++++++++++----- src/backend/optimizer/plan/planner.c | 3 +++ src/backend/optimizer/plan/setrefs.c | 27 ++++++++++++++++++++++- src/backend/optimizer/prep/prepjointree.c | 4 ++++ src/include/nodes/plannodes.h | 19 ++++++++++++++++ 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 610f4a56d6..a9138e3395 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -286,9 +286,11 @@ static WindowAgg *make_windowagg(List *tlist, Index winref, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, int frameOptions, Node *startOffset, Node *endOffset, Oid startInRangeFunc, Oid endInRangeFunc, - Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, - List *runCondition, List *qual, bool topWindow, - Plan *lefttree); + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, + List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree); static Group *make_group(List *tlist, List *qual, int numGroupCols, AttrNumber *grpColIdx, Oid *grpOperators, Oid *grpCollations, Plan *lefttree); @@ -2698,6 +2700,11 @@ create_windowagg_plan(PlannerInfo *root, WindowAggPath *best_path) wc->inRangeAsc, wc->inRangeNullsFirst, wc->runCondition, + wc->rpSkipTo, + wc->patternVariable, + wc->patternRegexp, + wc->defineClause, + wc->defineInitial, best_path->qual, best_path->topwindow, subplan); @@ -6610,8 +6617,10 @@ make_windowagg(List *tlist, Index winref, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, int frameOptions, Node *startOffset, Node *endOffset, Oid startInRangeFunc, Oid endInRangeFunc, - Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, - List *runCondition, List *qual, bool topWindow, Plan *lefttree) + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree) { WindowAgg *node = makeNode(WindowAgg); Plan *plan = &node->plan; @@ -6637,6 +6646,11 @@ make_windowagg(List *tlist, Index winref, node->inRangeAsc = inRangeAsc; node->inRangeNullsFirst = inRangeNullsFirst; node->topWindow = topWindow; + node->rpSkipTo = rpSkipTo, + node->patternVariable = patternVariable; + node->patternRegexp = patternRegexp; + node->defineClause = defineClause; + node->defineInitial = defineInitial; plan->targetlist = tlist; plan->lefttree = lefttree; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index be4e182869..1ddfc3ed2d 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -870,6 +870,9 @@ subquery_planner(PlannerGlobal *glob, Query *parse, wc->runCondition = (List *) preprocess_expression(root, (Node *) wc->runCondition, EXPRKIND_TARGET); + wc->defineClause = (List *) preprocess_expression(root, + (Node *) wc->defineClause, + EXPRKIND_TARGET); } parse->limitOffset = preprocess_expression(root, parse->limitOffset, diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 22a1fa29f3..6ab4eb759e 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -211,7 +211,6 @@ static List *set_windowagg_runcondition_references(PlannerInfo *root, List *runcondition, Plan *plan); - /***************************************************************************** * * SUBPLAN REFERENCES @@ -2456,6 +2455,32 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset) NRM_EQUAL, NUM_EXEC_QUAL(plan)); + /* + * Modifies an expression tree in each DEFINE clause so that all Var + * nodes's varno refers to OUTER_VAR. + */ + if (IsA(plan, WindowAgg)) + { + WindowAgg *wplan = (WindowAgg *) plan; + + if (wplan->defineClause != NIL) + { + foreach(l, wplan->defineClause) + { + TargetEntry *tle = (TargetEntry *) lfirst(l); + + tle->expr = (Expr *) + fix_upper_expr(root, + (Node *) tle->expr, + subplan_itlist, + OUTER_VAR, + rtoffset, + NRM_EQUAL, + NUM_EXEC_QUAL(plan)); + } + } + } + pfree(subplan_itlist); } diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index aa83dd3636..95d7399ab4 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -2129,6 +2129,10 @@ perform_pullup_replace_vars(PlannerInfo *root, if (wc->runCondition != NIL) wc->runCondition = (List *) pullup_replace_vars((Node *) wc->runCondition, rvcontext); + + if (wc->defineClause != NIL) + wc->defineClause = (List *) + pullup_replace_vars((Node *) wc->defineClause, rvcontext); } if (parse->onConflict) { diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index b4ef6bc44c..3425796212 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -20,6 +20,7 @@ #include "lib/stringinfo.h" #include "nodes/bitmapset.h" #include "nodes/lockoptions.h" +#include "nodes/parsenodes.h" #include "nodes/primnodes.h" @@ -1096,6 +1097,24 @@ typedef struct WindowAgg /* nulls sort first for in_range tests? */ bool inRangeNullsFirst; + /* Row Pattern Recognition AFTER MACH SKIP clause */ + RPSkipTo rpSkipTo; /* Row Pattern Skip To type */ + + /* Row Pattern PATTERN variable name (list of String) */ + List *patternVariable; + + /* + * Row Pattern RPATTERN regular expression quantifier ('+' or ''. list of + * String) + */ + List *patternRegexp; + + /* Row Pattern DEFINE clause (list of TargetEntry) */ + List *defineClause; + + /* Row Pattern DEFINE variable initial names (list of String) */ + List *defineInitial; + /* * false for all apart from the WindowAgg that's closest to the root of * the plan -- 2.25.1 ----Next_Part(Thu_Feb_29_09_19_54_2024_640)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v14-0005-Row-pattern-recognition-patch-executor.patch" ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
* [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber @ 2025-10-31 16:05 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 210+ messages in thread From: Álvaro Herrera @ 2025-10-31 16:05 UTC (permalink / raw) This is a simple bool --- src/bin/pg_basebackup/pg_createsubscriber.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index 52e7c9212a2..c1120d3643e 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -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; } @@ -1616,7 +1610,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"); -- 2.47.3 --iqvkb7rmsfgsymxy-- ^ permalink raw reply [nested|flat] 210+ messages in thread
end of thread, other threads:[~2025-10-31 16:05 UTC | newest] Thread overview: 210+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2024-02-28 13:59 [PATCH v14 4/8] Row pattern recognition patch (planner). Tatsuo Ishii <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]> 2025-10-31 16:05 [PATCH 2/2] Remove WaitPMResult enum in pg_createsubscriber Álvaro Herrera <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox