From 973a8d2680f968e83e5668e69c87636189146e54 Mon Sep 17 00:00:00 2001
From: Matthias van de Meent <matthias@neon.tech>
Date: Fri, 29 Nov 2024 20:10:26 +0100
Subject: [PATCH] Fix timeout value used in XLogWaitForReplayOf (#9937)

The previous value assumed usec precision, while the timeout used is in
milliseconds, causing replica backends to wait for (potentially) many
hours for WAL replay without the expected progress reports in logs.

This fixes the issue.

Reported-By: Alexander Lakhin <exclusion@gmail.com>

## Problem


https://github.com/neondatabase/postgres/pull/279#issuecomment-2507671817

The timeout value was configured with the assumption the indicated value
would be microseconds, where it's actually milliseconds. That causes the
backend to wait for much longer (2h46m40s) before it emits the "I'm
waiting for recovery" message. While we do have wait events configured
on this, it's not great to have stuck backends without clear logs, so
this fixes the timeout value in all our PostgreSQL branches.

## PG PRs

* PG14: https://github.com/neondatabase/postgres/pull/542
* PG15: https://github.com/neondatabase/postgres/pull/543
* PG16: https://github.com/neondatabase/postgres/pull/544
* PG17: https://github.com/neondatabase/postgres/pull/545
---
 vendor/postgres-v14   | 2 +-
 vendor/postgres-v15   | 2 +-
 vendor/postgres-v16   | 2 +-
 vendor/postgres-v17   | 2 +-
 vendor/revisions.json | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vendor/postgres-v14 b/vendor/postgres-v14
index 284ae56be239..c1989c934d46 160000
--- a/vendor/postgres-v14
+++ b/vendor/postgres-v14
@@ -1 +1 @@
-Subproject commit 284ae56be2397fd3eaf20777fa220b2d0ad968f5
+Subproject commit c1989c934d46e04e78b3c496c8a34bcd40ddceeb
diff --git a/vendor/postgres-v15 b/vendor/postgres-v15
index aed79ee87b94..d929b9a8b9f3 160000
--- a/vendor/postgres-v15
+++ b/vendor/postgres-v15
@@ -1 +1 @@
-Subproject commit aed79ee87b94779cc52ec13e3b74eba6ada93f05
+Subproject commit d929b9a8b9f32f6fe5a0eac3e6e963f0e44e27e6
diff --git a/vendor/postgres-v16 b/vendor/postgres-v16
index f5cfc6fa8985..13e9e3539419 160000
--- a/vendor/postgres-v16
+++ b/vendor/postgres-v16
@@ -1 +1 @@
-Subproject commit f5cfc6fa898544050e821ac688adafece1ac3cff
+Subproject commit 13e9e3539419003e79bd9aa29e1bc44f3fd555dd
diff --git a/vendor/postgres-v17 b/vendor/postgres-v17
index 3c15b6565f6c..faebe5e5aff5 160000
--- a/vendor/postgres-v17
+++ b/vendor/postgres-v17
@@ -1 +1 @@
-Subproject commit 3c15b6565f6c8d36d169ed9ea7412cf90cfb2a8f
+Subproject commit faebe5e5aff5687908504453623778f8515529db
diff --git a/vendor/revisions.json b/vendor/revisions.json
index 4dae88e73dc1..abeddcadf73c 100644
--- a/vendor/revisions.json
+++ b/vendor/revisions.json
@@ -1,18 +1,18 @@
 {
   "v17": [
     "17.2",
-    "3c15b6565f6c8d36d169ed9ea7412cf90cfb2a8f"
+    "faebe5e5aff5687908504453623778f8515529db"
   ],
   "v16": [
     "16.6",
-    "f5cfc6fa898544050e821ac688adafece1ac3cff"
+    "13e9e3539419003e79bd9aa29e1bc44f3fd555dd"
   ],
   "v15": [
     "15.10",
-    "aed79ee87b94779cc52ec13e3b74eba6ada93f05"
+    "d929b9a8b9f32f6fe5a0eac3e6e963f0e44e27e6"
   ],
   "v14": [
     "14.15",
-    "284ae56be2397fd3eaf20777fa220b2d0ad968f5"
+    "c1989c934d46e04e78b3c496c8a34bcd40ddceeb"
   ]
 }