Move check if (shutdown_requested) inside recoveryStopsHere() so that it occurs immed...

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 39df968fff37121dea0c910cd7e1421229e6cd0e..7bbae2d3690445fc592a41aefc09fa578eef0089 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5003,6 +5003,13 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis)
 
                CHECK_FOR_INTERRUPTS();
 
+               /*
+                * Check if we were requested to exit without finishing
+                * recovery.
+                */
+               if (shutdown_requested)
+                       proc_exit(0);
+
                /*
                 * Let's see if user has updated our recoveryTargetMode.
                 */
@@ -5970,13 +5977,6 @@ StartupXLOG(void)
                                }
 #endif
 
-                               /*
-                                * Check if we were requested to exit without finishing
-                                * recovery.
-                                */
-                               if (shutdown_requested)
-                                       proc_exit(0);
-
                                /*
                                 * Have we reached our safe starting point? If so, we can
                                 * tell postmaster that the database is consistent now.