postgres.git / summary / log / commit / refs

commit    47387732ba28e940e27f3f82c657d11bab628e1a
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Wed Sep 09 13:51:44 2015 +0000
First released in: 9.6.0, 9.1.19, 9.2.14, 9.3.10, 9.4.5, 9.5.0

    Remove files signaling a standby promotion request at postmaster startup
    
    This commit makes postmaster forcibly remove the files signaling
    a standby promotion request. Otherwise, the existence of those files
    can trigger a promotion too early, whether a user wants that or not.
    
    This removal of files is usually unnecessary because they can exist
    only during a few moments during a standby promotion. However
    there is a race condition: if pg_ctl promote is executed and creates
    the files during a promotion, the files can stay around even after
    the server is brought up to new master. Then, if new standby starts
    by using the backup taken from that master, the files can exist
    at the server startup and should be removed in order to avoid
    an unexpected promotion.
    
    Back-patch to 9.1 where promote signal file was introduced.
    
    Problem reported by Feike Steenbergen.
    Original patch by Michael Paquier, modified by me.
    
    Discussion: 20150528100705.4686.91426@wrigleys.postgresql.org


 src/backend/access/transam/xlog.c   | 10 ++++++++++
 src/backend/postmaster/postmaster.c | 21 +++++++++++++++++++++
 src/include/access/xlog.h           |  1 +
 3 files changed, 32 insertions(+)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 9d160daa6ce..dadaa94bc82 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -10152,6 +10152,16 @@ CheckForStandbyTrigger(void)
 	return false;
 }
 
+/*
+ * Remove the files signaling a standby promotion request.
+ */
+void
+RemovePromoteSignalFiles(void)
+{
+	unlink(PROMOTE_SIGNAL_FILE);
+	unlink(FALLBACK_PROMOTE_SIGNAL_FILE);
+}
+
 /*
  * Check to see if a promote request has arrived. Should be
  * called by postmaster after receiving SIGUSR1.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 864572ebaed..f0bba9e104a 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1198,6 +1198,27 @@ PostmasterMain(int argc, char *argv[])
 	 */
 	RemovePgTempFiles();
 
+	/*
+	 * Forcibly remove the files signaling a standby promotion
+	 * request. Otherwise, the existence of those files triggers
+	 * a promotion too early, whether a user wants that or not.
+	 *
+	 * This removal of files is usually unnecessary because they
+	 * can exist only during a few moments during a standby
+	 * promotion. However there is a race condition: if pg_ctl promote
+	 * is executed and creates the files during a promotion,
+	 * the files can stay around even after the server is brought up
+	 * to new master. Then, if new standby starts by using the backup
+	 * taken from that master, the files can exist at the server
+	 * startup and should be removed in order to avoid an unexpected
+	 * promotion.
+	 *
+	 * Note that promotion signal files need to be removed before
+	 * the startup process is invoked. Because, after that, they can
+	 * be used by postmaster's SIGUSR1 signal handler.
+	 */
+	RemovePromoteSignalFiles();
+
 	/*
 	 * If enabled, start up syslogger collection subprocess
 	 */
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 7e0b0c24bc6..0130ef94825 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -316,6 +316,7 @@ extern XLogRecPtr GetRedoRecPtr(void);
 extern XLogRecPtr GetInsertRecPtr(void);
 extern XLogRecPtr GetFlushRecPtr(void);
 extern void GetNextXidAndEpoch(TransactionId *xid, uint32 *epoch);
+extern void RemovePromoteSignalFiles(void);
 
 extern bool CheckPromoteSignal(void);
 extern void WakeupRecovery(void);


[parent: cb1b9b959cf0]