pg_createsubscriber: Remove some code bloat in the atexit() callback

michaelpq · michaelpq · commit 83e5763d4ddd · 2025-03-16T19:20:49.000+09:00
This commit adjusts some code added by e117cfb in the atexit() callback of pg_createsubscriber.c, in charge of performing post-failure cleanup actions. The code loops over all the databases specified, and it is changed here to rely on a single LogicalRepInfo for each database rather than always using LogicalRepInfos, simplifying its logic. Author: Peter Smith <smithpb2250@gmail.com> Discussion: https://postgr.es/m/CAHut+PtdBSVi4iH7BObDVwDNVwOpn+H3fezOBdSTtENx+rhNMw@mail.gmail.com
diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c
@@ -184,17 +184,19 @@ cleanup_objects_atexit(void)
 
 	for (int i = 0; i < num_dbs; i++)
 	{
-		if (dbinfos.dbinfo[i].made_publication || dbinfos.dbinfo[i].made_replslot)
+		struct LogicalRepInfo *dbinfo = &dbinfos.dbinfo[i];
+
+		if (dbinfo->made_publication || dbinfo->made_replslot)
 		{
 			PGconn	   *conn;
 
-			conn = connect_database(dbinfos.dbinfo[i].pubconninfo, false);
+			conn = connect_database(dbinfo->pubconninfo, false);
 			if (conn != NULL)
 			{
-				if (dbinfos.dbinfo[i].made_publication)
-					drop_publication(conn, &dbinfos.dbinfo[i]);
-				if (dbinfos.dbinfo[i].made_replslot)
-					drop_replication_slot(conn, &dbinfos.dbinfo[i], dbinfos.dbinfo[i].replslotname);
+				if (dbinfo->made_publication)
+					drop_publication(conn, dbinfo);
+				if (dbinfo->made_replslot)
+					drop_replication_slot(conn, dbinfo, dbinfo->replslotname);
 				disconnect_database(conn, false);
 			}
 			else
@@ -204,18 +206,18 @@ cleanup_objects_atexit(void)
 				 * that some objects were left on primary and should be
 				 * removed before trying again.
 				 */
-				if (dbinfos.dbinfo[i].made_publication)
+				if (dbinfo->made_publication)
 				{
 					pg_log_warning("publication \"%s\" created in database \"%s\" on primary was left behind",
-								   dbinfos.dbinfo[i].pubname,
-								   dbinfos.dbinfo[i].dbname);
+								   dbinfo->pubname,
+								   dbinfo->dbname);
 					pg_log_warning_hint("Drop this publication before trying again.");
 				}
-				if (dbinfos.dbinfo[i].made_replslot)
+				if (dbinfo->made_replslot)
 				{
 					pg_log_warning("replication slot \"%s\" created in database \"%s\" on primary was left behind",
-								   dbinfos.dbinfo[i].replslotname,
-								   dbinfos.dbinfo[i].dbname);
+								   dbinfo->replslotname,
+								   dbinfo->dbname);
 					pg_log_warning_hint("Drop this replication slot soon to avoid retention of WAL files.");
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -184,17 +184,19 @@ cleanup_objects_atexit(void)`
`184`	`184`
`185`	`185`	`for (int i = 0; i < num_dbs; i++)`
`186`	`186`	`{`
`187`		`- if (dbinfos.dbinfo[i].made_publication \|\| dbinfos.dbinfo[i].made_replslot)`
	`187`	`+ struct LogicalRepInfo *dbinfo = &dbinfos.dbinfo[i];`
	`188`	`+`
	`189`	`+ if (dbinfo->made_publication \|\| dbinfo->made_replslot)`
`188`	`190`	`{`
`189`	`191`	`PGconn *conn;`
`190`	`192`
`191`		`- conn = connect_database(dbinfos.dbinfo[i].pubconninfo, false);`
	`193`	`+ conn = connect_database(dbinfo->pubconninfo, false);`
`192`	`194`	`if (conn != NULL)`
`193`	`195`	`{`
`194`		`- if (dbinfos.dbinfo[i].made_publication)`
`195`		`- drop_publication(conn, &dbinfos.dbinfo[i]);`
`196`		`- if (dbinfos.dbinfo[i].made_replslot)`
`197`		`- drop_replication_slot(conn, &dbinfos.dbinfo[i], dbinfos.dbinfo[i].replslotname);`
	`196`	`+ if (dbinfo->made_publication)`
	`197`	`+ drop_publication(conn, dbinfo);`
	`198`	`+ if (dbinfo->made_replslot)`
	`199`	`+ drop_replication_slot(conn, dbinfo, dbinfo->replslotname);`
`198`	`200`	`disconnect_database(conn, false);`
`199`	`201`	`}`
`200`	`202`	`else`
`@@ -204,18 +206,18 @@ cleanup_objects_atexit(void)`
`204`	`206`	`* that some objects were left on primary and should be`
`205`	`207`	`* removed before trying again.`
`206`	`208`	`*/`
`207`		`- if (dbinfos.dbinfo[i].made_publication)`
	`209`	`+ if (dbinfo->made_publication)`
`208`	`210`	`{`
`209`	`211`	`pg_log_warning("publication \"%s\" created in database \"%s\" on primary was left behind",`
`210`		`- dbinfos.dbinfo[i].pubname,`
`211`		`- dbinfos.dbinfo[i].dbname);`
	`212`	`+ dbinfo->pubname,`
	`213`	`+ dbinfo->dbname);`
`212`	`214`	`pg_log_warning_hint("Drop this publication before trying again.");`
`213`	`215`	`}`
`214`		`- if (dbinfos.dbinfo[i].made_replslot)`
	`216`	`+ if (dbinfo->made_replslot)`
`215`	`217`	`{`
`216`	`218`	`pg_log_warning("replication slot \"%s\" created in database \"%s\" on primary was left behind",`
`217`		`- dbinfos.dbinfo[i].replslotname,`
`218`		`- dbinfos.dbinfo[i].dbname);`
	`219`	`+ dbinfo->replslotname,`
	`220`	`+ dbinfo->dbname);`
`219`	`221`	`pg_log_warning_hint("Drop this replication slot soon to avoid retention of WAL files.");`
`220`	`222`	`}`
`221`	`223`	`}`