Prevents query conflict from suspending a failover.

After the standby has been triggered, we cancel the
conflicting query and transactions immediately to
speed up a failover.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index f22139b..239abf9 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9768,12 +9768,22 @@ CheckForStandbyTrigger(void)
                                (errmsg("trigger file found: %s", TriggerFile)));
                ShutdownWalRcv();
                unlink(TriggerFile);
+               standby_triggered = true;
                return true;
        }
        return false;
 }
 
 /*
+ * Is the standby triggered?
+ */
+bool
+StandbyIsTriggered(void)
+{
+       return standby_triggered;
+}
+
+/*
  * Wake up startup process to replay newly arrived WAL, or to notice that
  * failover has been requested.
  */

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 2f9fe8a..3836e1d 100644 (file)
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -227,7 +227,7 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,
                        }
 
                        /* Is it time to kill it? */
-                       if (WaitExceedsMaxStandbyDelay())
+                       if (StandbyIsTriggered() || WaitExceedsMaxStandbyDelay())
                        {
                                pid_t           pid;
 

diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index fa6d84c..6dba7dc 100644 (file)
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -331,6 +331,7 @@ extern TimeLineID GetRecoveryTargetTLI(void);
 
 extern void HandleStartupProcInterrupts(void);
 extern void StartupProcessMain(void);
+extern bool StandbyIsTriggered(void);
 extern void WakeupRecovery(void);
 
 #endif   /* XLOG_H */