git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Refresh apply delay on reload of recovery_min_apply_delay at recovery

author Michael Paquier <michael@paquier.xyz>

2021年8月16日 03:10:22 +0000 (12:10 +0900)

committer Michael Paquier <michael@paquier.xyz>

2021年8月16日 03:10:22 +0000 (12:10 +0900)

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

src/backend/access/transam/xlog.c patch | blob | blame | history

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c

index d0ec6a834be8cee431ac3f8f0719e1ffebc5b502..e51a7a749da949997f95546d38ee0af06b626c5d 100644 (file)

--- a/src/backend/access/transam/xlog.c

+++ b/src/backend/access/transam/xlog.c

@@ -6248,14 +6248,23 @@ 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.