database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

pg_rewind: Improve some messages

Browse Source 
The output of a typical pg_rewind run contained a mix of capitalized and
not-capitalized and punctuated and not-punctuated phrases for no
apparent reason.  Make that consistent.  Also fix some problems in other
messages.
This commit is contained in:
Peter Eisentraut 2015-10-01 21:42:00 -04:00
parent 867bc6849f
commit 0f51a848ab
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_rewind/file_ops.c
View File

@ -198,7 +198,7 @@ truncate_target_file(const char *path, off_t newsize)
dstpath, strerror(errno)); dstpath, strerror(errno));
if (ftruncate(fd, newsize) != 0) if (ftruncate(fd, newsize) != 0)
pg_fatal("could not truncate file \"%s\" to %u bytes: %s\n", pg_fatal("could not truncate file \"%s\" to %u: %s\n",
dstpath, (unsigned int) newsize, strerror(errno)); dstpath, (unsigned int) newsize, strerror(errno));
close(fd); close(fd);

6
src/bin/pg_rewind/libpq_fetch.c
View File

@ -120,7 +120,7 @@ libpqGetCurrentXlogInsertLocation(void)
val = run_simple_query("SELECT pg_current_xlog_insert_location()"); val = run_simple_query("SELECT pg_current_xlog_insert_location()");
if (sscanf(val, "%X/%X", &hi, &lo) != 2) if (sscanf(val, "%X/%X", &hi, &lo) != 2)
pg_fatal("unrecognized result \"%s\" for current XLOG insert location\n", val); pg_fatal("unrecognized result \"%s\" for current WAL insert location\n", val);
result = ((uint64) hi) << 32 | lo; result = ((uint64) hi) << 32 | lo;
@ -248,7 +248,7 @@ receiveFileChunks(const char *sql)
continue; /* final zero-row result */ continue; /* final zero-row result */
default: default:
pg_fatal("unexpected result while fetching remote files: %s\n", pg_fatal("unexpected result while fetching remote files: %s",
PQresultErrorMessage(res)); PQresultErrorMessage(res));
} }
@ -300,7 +300,7 @@ receiveFileChunks(const char *sql)
if (PQgetisnull(res, 0, 2)) if (PQgetisnull(res, 0, 2))
{ {
pg_log(PG_DEBUG, pg_log(PG_DEBUG,
"received NULL chunk for file \"%s\", file has been deleted\n", "received null value for chunk for file \"%s\", file has been deleted\n",
filename); filename);
pg_free(filename); pg_free(filename);
PQclear(res); PQclear(res);

6
src/bin/pg_rewind/pg_rewind.c
View File

@ -215,7 +215,7 @@ main(int argc, char **argv)
pg_fatal("source and target cluster are on the same timeline\n"); pg_fatal("source and target cluster are on the same timeline\n");
findCommonAncestorTimeline(&divergerec, &lastcommontli); findCommonAncestorTimeline(&divergerec, &lastcommontli);
printf(_("The servers diverged at WAL position %X/%X on timeline %u.\n"), printf(_("servers diverged at WAL position %X/%X on timeline %u\n"),
(uint32) (divergerec >> 32), (uint32) divergerec, lastcommontli); (uint32) (divergerec >> 32), (uint32) divergerec, lastcommontli);
/* /*
@ -250,13 +250,13 @@ main(int argc, char **argv)
if (!rewind_needed) if (!rewind_needed)
{ {
printf(_("No rewind required.\n")); printf(_("no rewind required\n"));
exit(0); exit(0);
} }
findLastCheckpoint(datadir_target, divergerec, lastcommontli, findLastCheckpoint(datadir_target, divergerec, lastcommontli,
&chkptrec, &chkpttli, &chkptredo); &chkptrec, &chkpttli, &chkptredo);
printf(_("Rewinding from last common checkpoint at %X/%X on timeline %u\n"), printf(_("rewinding from last common checkpoint at %X/%X on timeline %u\n"),
(uint32) (chkptrec >> 32), (uint32) chkptrec, (uint32) (chkptrec >> 32), (uint32) chkptrec,
chkpttli); chkpttli);

2
src/bin/pg_rewind/timeline.c
View File

@ -80,7 +80,7 @@ rewind_parseTimeLineHistory(char *buffer, TimeLineID targetTLI, int *nentries)
if (nfields != 3) if (nfields != 3)
{ {
fprintf(stderr, _("syntax error in history file: %s\n"), fline); fprintf(stderr, _("syntax error in history file: %s\n"), fline);
fprintf(stderr, _("Expected an XLOG switchpoint location.\n")); fprintf(stderr, _("Expected a transaction log switchpoint location.\n"));
exit(1); exit(1);
} }
if (entries && tli <= lasttli) if (entries && tli <= lasttli)