pg_upgrade: Upgrade an Assert to a real 'if' test

It seems possible for the condition being tested to be true in
production, and nobody would never know (except when some data
eventually becomes corrupt?).

Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://postgr.es/m//202109040001.zky3wgv2qeqg@alvherre.pgsql

diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 1a67725ec047254095c844f750b5b5bd11567d58..cb1bdc958d36ad3aa40bab3e5bd99ce824f562f2 100644 (file)
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -101,7 +101,11 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex,
     * If 'endpoint' didn't point exactly at a record boundary, the caller
     * messed up.
     */
-   Assert(xlogreader->EndRecPtr == endpoint);
+   if (xlogreader->EndRecPtr != endpoint)
+       pg_fatal("end pointer %X/%X is not a valid end point; expected %X/%X",
+                (uint32) (endpoint >> 32), (uint32) (endpoint),
+                (uint32) (xlogreader->EndRecPtr >> 32), (uint32)
+                (xlogreader->EndRecPtr));
 
    XLogReaderFree(xlogreader);
    if (xlogreadfd != -1)