Merge branch 'master' into REL_2_5

funny-falcon · funny-falcon · commit 887fb82a2c73 · 2022-11-29T11:56:40.000+03:00
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ For detailed release plans check [Milestones](https://github.com/postgrespro/pg_
 
 ## Installation and Setup
 ### Windows Installation
-Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/2.4.15).
+Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/latest).
 
 ### Linux Installation
 #### pg_probackup for vanilla PostgreSQL
diff --git a/src/parsexlog.c b/src/parsexlog.c
@@ -1439,7 +1439,14 @@ XLogThreadWorker(void *arg)
 			 * Usually SimpleXLogPageRead() does it by itself. But here we need
 			 * to do it manually to support threads.
 			 */
-			if (reader_data->need_switch && errormsg == NULL)
+			if (reader_data->need_switch && (
+					errormsg == NULL ||
+					/*
+					 * Pg15 now informs if "contrecord" is missing.
+					 * TODO: probably we should abort reading logs at this moment.
+					 * But we continue as we did with bug present in Pg < 15.
+					 */
+					strncmp(errormsg, "missing contrecord", 18) == 0))
 			{
 				if (SwitchThreadToNextWal(xlogreader, thread_arg))
 					continue;
