postgres.git / summary / log / commit / refs

commit    3a3b7e316f85566771d3a28ea874e030fb12126b
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Thu Nov 06 12:24:40 2014 +0000

    Prevent the unnecessary creation of .ready file for the timeline history file.
    
    Previously .ready file was created for the timeline history file at the end
    of an archive recovery even when WAL archiving was not enabled.
    This creation is unnecessary and causes .ready file to remain infinitely.
    
    This commit changes an archive recovery so that it creates .ready file for
    the timeline history file only when WAL archiving is enabled.
    
    Backpatch to all supported versions.


 src/backend/access/transam/timeline.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/access/transam/timeline.c b/src/backend/access/transam/timeline.c
index 0f34c17e1f6..200808f7771 100644
--- a/src/backend/access/transam/timeline.c
+++ b/src/backend/access/transam/timeline.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 
 #include "access/timeline.h"
+#include "access/xlog.h"
 #include "access/xlog_internal.h"
 #include "access/xlogdefs.h"
 #include "storage/fd.h"
@@ -437,8 +438,11 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
 #endif
 
 	/* The history file can be archived immediately. */
-	TLHistoryFileName(histfname, newTLI);
-	XLogArchiveNotify(histfname);
+	if (XLogArchivingActive())
+	{
+		TLHistoryFileName(histfname, newTLI);
+		XLogArchiveNotify(histfname);
+	}
 }
 
 /*


[parent: 0247935c7b44]