database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-04 20:11:56 +03:00
Code Activity

pg_createsubscriber: reword dry-run log messages

Browse Source 
The original messages were confusing in dry-run mode in that they state
that something is being done, when in reality it isn't.  Use alternative
wording in that case, to make the distinction clear.

Author: Peter Smith <smithpb2250@gmail.com>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Reviewed-by: Euler Taveira <euler@eulerto.com>
Backpatch-through: 18
Discussion: https://postgr.es/m/CAHut+PsvQJQnQO0KT0S2oegenkvJ8FUuY-QS5syyqmT24R2xFQ@mail.gmail.com
This commit is contained in:
Álvaro Herrera
2025-10-31 18:49:50 +01:00
parent 59aeb693f6
commit c25314d536
2 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/bin/pg_basebackup/pg_createsubscriber.c
View File

@@ -679,12 +679,19 @@ modify_subscriber_sysid(const struct CreateSubscriberOptions *opt)
cf->system_identifier |= ((uint64) tv.tv_usec) << 12;
cf->system_identifier |= getpid() & 0xFFF;
if (!dry_run)
if (dry_run)
pg_log_info("dry-run: would set system identifier to %" PRIu64 " on subscriber",
cf->system_identifier);
else
{
update_controlfile(subscriber_dir, cf, true);
pg_log_info("system identifier is %" PRIu64 " on subscriber",
cf->system_identifier);
}
if (dry_run)
pg_log_info("dry-run: would run pg_resetwal on the subscriber");
else
pg_log_info("running pg_resetwal on the subscriber");
cmd_str = psprintf("\"%s\" -D \"%s\" > \"%s\"", pg_resetwal_path,
@@ -977,9 +984,9 @@ check_publisher(const struct LogicalRepInfo *dbinfo)
}
/*
* Validate 'max_slot_wal_keep_size'. If this parameter is set to a
* non-default value, it may cause replication failures due to required
* WAL files being prematurely removed.
* In dry-run mode, validate 'max_slot_wal_keep_size'. If this parameter
* is set to a non-default value, it may cause replication failures due to
* required WAL files being prematurely removed.
*/
if (dry_run && (strcmp(max_slot_wal_keep_size, "-1") != 0))
{
@@ -1124,11 +1131,14 @@ drop_existing_subscriptions(PGconn *conn, const char *subname, const char *dbnam
subname);
appendPQExpBuffer(query, " DROP SUBSCRIPTION %s;", subname);
if (dry_run)
pg_log_info("dry-run: would drop subscription \"%s\" in database \"%s\"",
subname, dbname);
else
{
pg_log_info("dropping subscription \"%s\" in database \"%s\"",
subname, dbname);
if (!dry_run)
{
res = PQexec(conn, query->data);
if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -1269,7 +1279,7 @@ setup_recovery(const struct LogicalRepInfo *dbinfo, const char *datadir, const c
if (dry_run)
{
appendPQExpBufferStr(recoveryconfcontents, "# dry run mode");
appendPQExpBufferStr(recoveryconfcontents, "# dry run mode\n");
appendPQExpBuffer(recoveryconfcontents,
"recovery_target_lsn = '%X/%X'\n",
LSN_FORMAT_ARGS((XLogRecPtr) InvalidXLogRecPtr));
@@ -1375,7 +1385,11 @@ create_logical_replication_slot(PGconn *conn, struct LogicalRepInfo *dbinfo)
Assert(conn != NULL);
pg_log_info("creating the replication slot \"%s\" in database \"%s\"",
if (dry_run)
pg_log_info("dry-run: would create the replication slot \"%s\" in database \"%s\" on publisher",
slot_name, dbinfo->dbname);
else
pg_log_info("creating the replication slot \"%s\" in database \"%s\" on publisher",
slot_name, dbinfo->dbname);
slot_name_esc = PQescapeLiteral(conn, slot_name, strlen(slot_name));
@@ -1424,6 +1438,10 @@ drop_replication_slot(PGconn *conn, struct LogicalRepInfo *dbinfo,
Assert(conn != NULL);
if (dry_run)
pg_log_info("dry-run: would drop the replication slot \"%s\" in database \"%s\"",
slot_name, dbinfo->dbname);
else
pg_log_info("dropping the replication slot \"%s\" in database \"%s\"",
slot_name, dbinfo->dbname);
@@ -1569,13 +1587,8 @@ wait_for_end_recovery(const char *conninfo, const struct CreateSubscriberOptions
for (;;)
{
bool in_recovery = server_is_in_recovery(conn);
/*
* Does the recovery process finish? In dry run mode, there is no
* recovery mode. Bail out as the recovery process has ended.
*/
if (!in_recovery || dry_run)
/* Did the recovery process finish? We're done if so. */
if (dry_run || !server_is_in_recovery(conn))
{
status = POSTMASTER_READY;
recovery_ended = true;
@@ -1651,6 +1664,10 @@ create_publication(PGconn *conn, struct LogicalRepInfo *dbinfo)
PQclear(res);
resetPQExpBuffer(str);
if (dry_run)
pg_log_info("dry-run: would create publication \"%s\" in database \"%s\"",
dbinfo->pubname, dbinfo->dbname);
else
pg_log_info("creating publication \"%s\" in database \"%s\"",
dbinfo->pubname, dbinfo->dbname);
@@ -1694,6 +1711,10 @@ drop_publication(PGconn *conn, const char *pubname, const char *dbname,
pubname_esc = PQescapeIdentifier(conn, pubname, strlen(pubname));
if (dry_run)
pg_log_info("dry-run: would drop publication \"%s\" in database \"%s\"",
pubname, dbname);
else
pg_log_info("dropping publication \"%s\" in database \"%s\"",
pubname, dbname);
@@ -1803,6 +1824,10 @@ create_subscription(PGconn *conn, const struct LogicalRepInfo *dbinfo)
pubconninfo_esc = PQescapeLiteral(conn, dbinfo->pubconninfo, strlen(dbinfo->pubconninfo));
replslotname_esc = PQescapeLiteral(conn, dbinfo->replslotname, strlen(dbinfo->replslotname));
if (dry_run)
pg_log_info("dry-run: would create subscription \"%s\" in database \"%s\"",
dbinfo->subname, dbinfo->dbname);
else
pg_log_info("creating subscription \"%s\" in database \"%s\"",
dbinfo->subname, dbinfo->dbname);
@@ -1901,6 +1926,10 @@ set_replication_progress(PGconn *conn, const struct LogicalRepInfo *dbinfo, cons
*/
originname = psprintf("pg_%u", suboid);
if (dry_run)
pg_log_info("dry-run: would set the replication progress (node name \"%s\", LSN %s) in database \"%s\"",
originname, lsnstr, dbinfo->dbname);
else
pg_log_info("setting the replication progress (node name \"%s\", LSN %s) in database \"%s\"",
originname, lsnstr, dbinfo->dbname);
@@ -1947,6 +1976,10 @@ enable_subscription(PGconn *conn, const struct LogicalRepInfo *dbinfo)
subname = PQescapeIdentifier(conn, dbinfo->subname, strlen(dbinfo->subname));
if (dry_run)
pg_log_info("dry-run: would enable subscription \"%s\" in database \"%s\"",
dbinfo->subname, dbinfo->dbname);
else
pg_log_info("enabling subscription \"%s\" in database \"%s\"",
dbinfo->subname, dbinfo->dbname);

6
src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
View File

@@ -436,11 +436,11 @@ my ($stdout, $stderr) = run_command(
# Verify that the required logical replication objects are output.
# The expected count 3 refers to postgres, $db1 and $db2 databases.
is(scalar(() = $stderr =~ /creating publication/g),
is(scalar(() = $stderr =~ /would create publication/g),
3, "verify publications are created for all databases");
is(scalar(() = $stderr =~ /creating the replication slot/g),
is(scalar(() = $stderr =~ /would create the replication slot/g),
3, "verify replication slots are created for all databases");
is(scalar(() = $stderr =~ /creating subscription/g),
is(scalar(() = $stderr =~ /would create subscription/g),
3, "verify subscriptions are created for all databases");
# Run pg_createsubscriber on node S. --verbose is used twice