Fix entering hot standby mode for Neon

neondatabase · May 11, 2023 · 1984832 · 1984832
1 parent cf9ce82
commit 1984832
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
@@ -1135,7 +1135,7 @@ readRecoverySignalFile(void)
 	if (standby_signal_file_found)
 	{
 		StandbyModeRequested = true;
-		ArchiveRecoveryRequested = XLogRecPtrIsInvalid(zenithLastRec); /* no need to perform WAL recovery in Neon */
+		ArchiveRecoveryRequested = true;
 	}
 	else if (recovery_signal_file_found)
 	{
@@ -1786,7 +1786,10 @@ PerformWalRecovery(void)
 	else
 	{
 		/* just have to read next record after CheckPoint */
-		Assert(xlogreader->ReadRecPtr == CheckPointLoc);
+		if (ZenithRecoveryRequested)
+			xlogreader->ReadRecPtr = CheckPointLoc;
+		else
+			Assert(xlogreader->ReadRecPtr == CheckPointLoc);
 		replayTLI = CheckPointTLI;
 		record = ReadRecord(xlogprefetcher, LOG, false, replayTLI);
 	}