Fix error message related to end TLI in backup manifest

The code adding the WAL information included in a backup manifest is
cross-checked with the contents of the timeline history file of the end
timeline.  A check based on the end timeline, when it fails, reported
the value of the start timeline in the error message.  This error is
fixed to show the correct timeline number in the report.

This error report would be confusing for users if seen, because it would
provide an incorrect information, so backpatch all the way down.

Oversight in 0d8c9c1210c4.

Author: Man Zeng <zengman@halodbtech.com>
Discussion: https://postgr.es/m/tencent_0F2949C4594556F672CF4658@qq.com
Backpatch-through: 14

diff --git a/src/backend/backup/backup_manifest.c b/src/backend/backup/backup_manifest.c
index 85bc96914dc6e913064324649d7f07269065b49a..c697caef895a30b4f09fe7d4aaeca780ce1c64a9 100644 (file)
--- a/src/backend/backup/backup_manifest.c
+++ b/src/backend/backup/backup_manifest.c
@@ -253,7 +253,7 @@ AddWALInfoToBackupManifest(backup_manifest_info *manifest, XLogRecPtr startptr,
                if (first_wal_range && endtli != entry->tli)
                        ereport(ERROR,
                                        errmsg("expected end timeline %u but found timeline %u",
-                                                  starttli, entry->tli));
+                                                  endtli, entry->tli));
 
                /*
                 * If this timeline entry matches with the timeline on which the