postgres.git / summary / log / commit / refs

commit    cc76577873945183352fa6e1e82cc14606c28fd3
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Thu Nov 06 12:24:40 2014 +0000
First released in: 9.5.0, 9.0.19, 9.1.15, 9.2.10, 9.3.6, 9.4.0

    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 2d27b3ae318..50e64882b8c 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: 26a95a1e521e]