postgres.git / summary / log / commit / refs

commit    d1e25b78f9988b9917de2818febcbf6c845c6ceb
Author:   Magnus Hagander <magnus@hagander.net>
Date:     Sun Oct 16 15:42:59 2011 +0000

    Exclude postmaster.opts from base backups
    
    Noted by Fujii Masao


 src/backend/replication/basebackup.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index 4841095d176..20d4ce36d88 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -583,8 +583,9 @@ sendDir(char *path, int basepathlen, bool sizeonly)
 
 		snprintf(pathbuf, MAXPGPATH, "%s/%s", path, de->d_name);
 
-		/* Skip postmaster.pid in the data directory */
-		if (strcmp(pathbuf, "./postmaster.pid") == 0)
+		/* Skip postmaster.pid and postmaster.opts in the data directory */
+		if (strcmp(pathbuf, "./postmaster.pid") == 0 ||
+			strcmp(pathbuf, "./postmaster.opts") == 0)
 			continue;
 
 		if (lstat(pathbuf, &statbuf) != 0)


[parent: 336c1d7a515b]