Content-Type: multipart/mixed; boundary="------------08J1CIC5LCDNRcEtZyEzkTFS"
Message-ID: <c3d617d4-1696-4aa7-8a4d-5a7d19cc5618@pgbackrest.org>
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
From: David Steele <david@pgbackrest.org>
Subject: Fix logging for invalid recovery timeline
To: Pg Hackers <pgsql-hackers@postgresql.org>
Date: Fri, 20 Dec 2024 15:37:36 +0000 (UTC)
Archived-At: 
 <https://www.postgresql.org/message-id/c3d617d4-1696-4aa7-8a4d-5a7d19cc5618%40pgbackrest.org>
Precedence: bulk

This is a multi-part message in MIME format.
--------------08J1CIC5LCDNRcEtZyEzkTFS
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

Hackers,

I noticed while debugging a user issue that the checkpoint logged in

"Latest checkpoint is at %X/%X on timeline %u, but in the history of the 
requested timeline, the server forked off from that timeline at %X/%X."

is being pulled from the value stored in the control file rather than 
the value read from backup_label (in the case where there is a 
backup_label). This only affects logging since the timeline check is 
done against the checkpoint/TLI as read from backup_label.

This patch updates the checkpoint and TLI to (what I believe are) the 
correct values for logging.

I think this should also be back-patched.

Regards,
-David
--------------08J1CIC5LCDNRcEtZyEzkTFS
Content-Type: text/plain; charset=UTF-8; name="timeline-log-v1.patch"
Content-Disposition: attachment; filename="timeline-log-v1.patch"
Content-Transfer-Encoding: base64

RnJvbSBmMTRlMzBiMThjZGUyMTYxMzFiZDNlMDY5ZWU4ZWNkNWRhMzMwMWIwIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBTdGVlbGUgPGRhdmlkQHBnbWFzdGVycy5u
ZXQ+CkRhdGU6IEZyaSwgMjAgRGVjIDIwMjQgMTU6MTM6NTkgKzAwMDAKU3ViamVjdDogRml4
IGxvZ2dpbmcgZm9yIGludmFsaWQgcmVjb3ZlcnkgdGltZWxpbmUuCgpJZiB0aGUgcmVxdWVz
dGVkIHJlY292ZXJ5IHRpbWVsaW5lIGlzIG5vdCByZWFjaGFibGUgdGhlIGxvZ2dlZCBjaGVj
a3BvaW50IGFuZApUTEkgc2hvdWxkIHRvIGJlIHRoZSB2YWx1ZXMgcmVhZCBmcm9tIGJhY2t1
cF9sYWJlbCB3aGVuIGJhY2t1cF9sYWJlbCBpcwpwcmVzZW50LgotLS0KIHNyYy9iYWNrZW5k
L2FjY2Vzcy90cmFuc2FtL3hsb2dyZWNvdmVyeS5jIHwgNiArKystLS0KIDEgZmlsZSBjaGFu
Z2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3Jj
L2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxvZ3JlY292ZXJ5LmMgYi9zcmMvYmFja2VuZC9h
Y2Nlc3MvdHJhbnNhbS94bG9ncmVjb3ZlcnkuYwppbmRleCBjNjk5NGI3ODI4Mi4uOTlhZmQw
MWJmMzggMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2dyZWNv
dmVyeS5jCisrKyBiL3NyYy9iYWNrZW5kL2FjY2Vzcy90cmFuc2FtL3hsb2dyZWNvdmVyeS5j
CkBAIC04NDQsMTMgKzg0NCwxMyBAQCBJbml0V2FsUmVjb3ZlcnkoQ29udHJvbEZpbGVEYXRh
ICpDb250cm9sRmlsZSwgYm9vbCAqd2FzU2h1dGRvd25fcHRyLAogCQkgKiB0bGlTd2l0Y2hQ
b2ludCB3aWxsIHRocm93IGFuIGVycm9yIGlmIHRoZSBjaGVja3BvaW50J3MgdGltZWxpbmUg
aXMKIAkJICogbm90IGluIGV4cGVjdGVkVExFcyBhdCBhbGwuCiAJCSAqLwotCQlzd2l0Y2hw
b2ludCA9IHRsaVN3aXRjaFBvaW50KENvbnRyb2xGaWxlLT5jaGVja1BvaW50Q29weS5UaGlz
VGltZUxpbmVJRCwgZXhwZWN0ZWRUTEVzLCBOVUxMKTsKKwkJc3dpdGNocG9pbnQgPSB0bGlT
d2l0Y2hQb2ludChDaGVja1BvaW50VExJLCBleHBlY3RlZFRMRXMsIE5VTEwpOwogCQllcmVw
b3J0KEZBVEFMLAogCQkJCShlcnJtc2coInJlcXVlc3RlZCB0aW1lbGluZSAldSBpcyBub3Qg
YSBjaGlsZCBvZiB0aGlzIHNlcnZlcidzIGhpc3RvcnkiLAogCQkJCQkJcmVjb3ZlcnlUYXJn
ZXRUTEkpLAogCQkJCSBlcnJkZXRhaWwoIkxhdGVzdCBjaGVja3BvaW50IGlzIGF0ICVYLyVY
IG9uIHRpbWVsaW5lICV1LCBidXQgaW4gdGhlIGhpc3Rvcnkgb2YgdGhlIHJlcXVlc3RlZCB0
aW1lbGluZSwgdGhlIHNlcnZlciBmb3JrZWQgb2ZmIGZyb20gdGhhdCB0aW1lbGluZSBhdCAl
WC8lWC4iLAotCQkJCQkJICAgTFNOX0ZPUk1BVF9BUkdTKENvbnRyb2xGaWxlLT5jaGVja1Bv
aW50KSwKLQkJCQkJCSAgIENvbnRyb2xGaWxlLT5jaGVja1BvaW50Q29weS5UaGlzVGltZUxp
bmVJRCwKKwkJCQkJCSAgIExTTl9GT1JNQVRfQVJHUyhDaGVja1BvaW50TG9jKSwKKwkJCQkJ
CSAgIENoZWNrUG9pbnRUTEksCiAJCQkJCQkgICBMU05fRk9STUFUX0FSR1Moc3dpdGNocG9p
bnQpKSkpOwogCX0KIAotLSAKMi4zNC4xCgo=

--------------08J1CIC5LCDNRcEtZyEzkTFS--