Commit 77ccbe64 authored by Tom Lane's avatar Tom Lane

Make recovery show the current input WAL segment name in the startup

process' PS display.  After a suggestion by Simon (not exactly his
patch though).
parent f6a54b8c
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.283 2007/09/29 01:36:10 tgl Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.284 2007/09/29 18:32:56 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "storage/spin.h" #include "storage/spin.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/pg_locale.h" #include "utils/pg_locale.h"
#include "utils/ps_status.h"
/* File path names (all relative to $PGDATA) */ /* File path names (all relative to $PGDATA) */
...@@ -2276,6 +2276,7 @@ XLogFileRead(uint32 log, uint32 seg, int emode) ...@@ -2276,6 +2276,7 @@ XLogFileRead(uint32 log, uint32 seg, int emode)
{ {
char path[MAXPGPATH]; char path[MAXPGPATH];
char xlogfname[MAXFNAMELEN]; char xlogfname[MAXFNAMELEN];
char activitymsg[MAXFNAMELEN + 16];
ListCell *cell; ListCell *cell;
int fd; int fd;
...@@ -2311,6 +2312,12 @@ XLogFileRead(uint32 log, uint32 seg, int emode) ...@@ -2311,6 +2312,12 @@ XLogFileRead(uint32 log, uint32 seg, int emode)
{ {
/* Success! */ /* Success! */
curFileTLI = tli; curFileTLI = tli;
/* Report recovery progress in PS display */
strcpy(activitymsg, "recovering ");
XLogFileName(activitymsg + 11, tli, log, seg);
set_ps_display(activitymsg, false);
return fd; return fd;
} }
if (errno != ENOENT) /* unexpected failure? */ if (errno != ENOENT) /* unexpected failure? */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment