Refresh apply delay on reload of recovery_min_apply_delay at recovery

michaelpq · michaelpq · commit 84c1bac579db · 2021-08-16T12:11:56.000+09:00
This commit ensures that the wait interval in the replay delay loop waiting for an amount of time defined by recovery_min_apply_delay is correctly handled on reload, recalculating the delay if this GUC value is updated, based on the timestamp of the commit record being replayed. The previous behavior would be problematic for example with replay still waiting even if the delay got reduced or just cancelled. If the apply delay was increased to a larger value, the wait would have just respected the old value set, finishing earlier. Author: Soumyadeep Chakraborty, Ashwin Agrawal Reviewed-by: Kyotaro Horiguchi, Michael Paquier Discussion: https://postgr.es/m/CAE-ML+93zfr-HLN8OuxF0BjpWJ17O5dv1eMvSE5jsj9jpnAXZA@mail.gmail.com Backpatch-through: 9.6
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -6053,12 +6053,22 @@ recoveryApplyDelay(XLogReaderState *record)
 	{
 		ResetLatch(&XLogCtl->recoveryWakeupLatch);
 
-		/* might change the trigger file's location */
+		/*
+		 * This might change recovery_min_apply_delay or the trigger file's
+		 * location.
+		 */
 		HandleStartupProcInterrupts();
 
 		if (CheckForStandbyTrigger())
 			break;
 
+		/*
+		 * Recalculate recoveryDelayUntilTime as recovery_min_apply_delay
+		 * could have changed while waiting in this loop.
+		 */
+		recoveryDelayUntilTime =
+			TimestampTzPlusMilliseconds(xtime, recovery_min_apply_delay);
+
 		/*
 		 * Wait for difference between GetCurrentTimestamp() and
 		 * recoveryDelayUntilTime
