NotificationsYou must be signed in to change notification settings
Fork5.2k
Star19k

Commitf242dbc

committed

Remove WaitPMResult enum in pg_createsubscriber

A simple boolean suffices. This is cosmetic, so no backpatch.Author: Álvaro Herrera <alvherre@kurilemu.de>Discussion:https://postgr.es/m/202510311750.mxiykx3tp4mx@alvherre.pgsql

1 parentad25744 commitf242dbcCopy full SHA for f242dbc

File tree

1 file changed

-9

lines changed

src/bin/pg_basebackup
- pg_createsubscriber.c

1 file changed

-9

lines changed

`‎src/bin/pg_basebackup/pg_createsubscriber.c‎`

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,6 @@ static char *subscriber_dir = NULL;`
`156`	`156`	`staticboolrecovery_ended= false;`
`157`	`157`	`staticboolstandby_running= false;`
`158`	`158`
`159`		`-enumWaitPMResult`
`160`		`-{`
`161`		`-POSTMASTER_READY,`
`162`		`-POSTMASTER_STILL_STARTING`
`163`		`-};`
`164`		`-`
`165`	`159`
`166`	`160`	`/*`
`167`	`161`	`* Cleanup objects that were created by pg_createsubscriber if there is an`
`@@ -1584,7 +1578,7 @@ static void`
`1584`	`1578`	`wait_for_end_recovery(constcharconninfo,conststructCreateSubscriberOptionsopt)`
`1585`	`1579`	`{`
`1586`	`1580`	`PGconn*conn;`
`1587`		`-intstatus=POSTMASTER_STILL_STARTING;`
	`1581`	`+boolready=false;`
`1588`	`1582`	`inttimer=0;`
`1589`	`1583`
`1590`	`1584`	`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`
`1596`	`1590`	`/* Did the recovery process finish? We're done if so. */`
`1597`	`1591`	`if (dry_run\|\| !server_is_in_recovery(conn))`
`1598`	`1592`	`{`
`1599`		`-status=POSTMASTER_READY;`
	`1593`	`+ready=true;`
`1600`	`1594`	`recovery_ended= true;`
`1601`	`1595`	`break;`
`1602`	`1596`	`}`
`@@ -1617,7 +1611,7 @@ wait_for_end_recovery(const char *conninfo, const struct CreateSubscriberOptions`
`1617`	`1611`
`1618`	`1612`	`disconnect_database(conn, false);`
`1619`	`1613`
`1620`		`-if (status==POSTMASTER_STILL_STARTING)`
	`1614`	`+if (!ready)`
`1621`	`1615`	`pg_fatal("server did not end recovery");`
`1622`	`1616`
`1623`	`1617`	`pg_log_info("target server reached the consistent state");`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf242dbc

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/pg_createsubscriber.c‎`

0 commit comments