1
0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00

Make archiver process report its progress in PS display. Per

proposal by Simon Riggs, though not exactly his patch.
This commit is contained in:
Tom Lane 2007-12-18 00:49:34 +00:00
parent dbc632eb37
commit 5335fabe8c

View File

@ -19,7 +19,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.35 2007/12/12 16:53:14 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.36 2007/12/18 00:49:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -414,6 +414,7 @@ pgarch_archiveXlog(char *xlog)
{ {
char xlogarchcmd[MAXPGPATH]; char xlogarchcmd[MAXPGPATH];
char pathname[MAXPGPATH]; char pathname[MAXPGPATH];
char activitymsg[MAXFNAMELEN + 16];
char *dp; char *dp;
char *endp; char *endp;
const char *sp; const char *sp;
@ -471,6 +472,11 @@ pgarch_archiveXlog(char *xlog)
ereport(DEBUG3, ereport(DEBUG3,
(errmsg_internal("executing archive command \"%s\"", (errmsg_internal("executing archive command \"%s\"",
xlogarchcmd))); xlogarchcmd)));
/* Report archive activity in PS display */
snprintf(activitymsg, sizeof(activitymsg), "archiving %s", xlog);
set_ps_display(activitymsg, false);
rc = system(xlogarchcmd); rc = system(xlogarchcmd);
if (rc != 0) if (rc != 0)
{ {
@ -527,11 +533,17 @@ pgarch_archiveXlog(char *xlog)
xlogarchcmd))); xlogarchcmd)));
} }
snprintf(activitymsg, sizeof(activitymsg), "failed on %s", xlog);
set_ps_display(activitymsg, false);
return false; return false;
} }
ereport(DEBUG1, ereport(DEBUG1,
(errmsg("archived transaction log file \"%s\"", xlog))); (errmsg("archived transaction log file \"%s\"", xlog)));
snprintf(activitymsg, sizeof(activitymsg), "last was %s", xlog);
set_ps_display(activitymsg, false);
return true; return true;
} }