From 1e4051dff9710382b6b4f63373a304c6ce70c4ac Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Sun, 26 Feb 2017 20:23:21 +0100 Subject: [PATCH 2/2] Mention initial checkpoint in pg_basebackup for verbose/progess output. Before the actual data directory contents are streamed, a checkpoint is taken on the remote server. Especially if no fast checkpoint is requested, this can take quite a while during which the pg_basebackup command apparently sits idle doing nothing. To alert the user that work is being done on the remote server, mention the checkpoint if verbose or progress output has been requested. As pg_basebackup does not output anything during regular operation, no additional output is printed in this case. Also harmonize some other verbose messages in passing. --- src/bin/pg_basebackup/pg_basebackup.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index bc997dc..4b75e76 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -1753,6 +1753,14 @@ BaseBackup(void) if (maxrate > 0) maxrate_clause = psprintf("MAX_RATE %u", maxrate); + if (verbose) + fprintf(stderr, + _("%s: initiating base backup, waiting for checkpoint to complete\n"), + progname); + + if (showprogress && !verbose) + fprintf(stderr, "waiting for checkpoint\n"); + basebkp = psprintf("BASE_BACKUP LABEL '%s' %s %s %s %s %s %s", escaped_label, @@ -1790,6 +1798,9 @@ BaseBackup(void) strlcpy(xlogstart, PQgetvalue(res, 0, 0), sizeof(xlogstart)); + if (verbose) + fprintf(stderr, _("%s: checkpoint completed\n"), progname); + /* * 9.3 and later sends the TLI of the starting point. With older servers, * assume it's the same as the latest timeline reported by @@ -1803,8 +1814,8 @@ BaseBackup(void) MemSet(xlogend, 0, sizeof(xlogend)); if (verbose && includewal != NO_WAL) - fprintf(stderr, _("transaction log start point: %s on timeline %u\n"), - xlogstart, starttli); + fprintf(stderr, _("%s: transaction log start point: %s on timeline %u\n"), + progname, xlogstart, starttli); /* * Get the header @@ -1906,7 +1917,7 @@ BaseBackup(void) } strlcpy(xlogend, PQgetvalue(res, 0, 0), sizeof(xlogend)); if (verbose && includewal != NO_WAL) - fprintf(stderr, "transaction log end point: %s\n", xlogend); + fprintf(stderr, _("%s: transaction log end point: %s\n"), progname, xlogend); PQclear(res); res = PQgetResult(conn); @@ -2047,7 +2058,7 @@ BaseBackup(void) } if (verbose) - fprintf(stderr, "%s: base backup completed\n", progname); + fprintf(stderr, _("%s: base backup completed\n"), progname); } -- 2.1.4