Fix LagTrackerRead() for timeline increments

simonat2ndQuadrant · simonat2ndQuadrant · commit 8463880872cf · 2017-04-23T21:35:41.000+01:00
Bug was masked by error in running 004_timeline_switch.pl that was fixed recently in 7d68f22. Detective work by Alvaro Herrera and Tom Lane Author: Thomas Munro
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -3328,7 +3328,16 @@ LagTrackerRead(int head, XLogRecPtr lsn, TimestampTz now)
 			WalTimeSample prev = LagTracker.last_read[head];
 			WalTimeSample next = LagTracker.buffer[LagTracker.read_heads[head]];
 
-			Assert(lsn >= prev.lsn);
+			if (lsn < prev.lsn)
+			{
+				/*
+				 * Reported LSNs shouldn't normally go backwards, but it's
+				 * possible when there is a timeline change.  Treat as not
+				 * found.
+				 */
+				return -1;
+			}
+
 			Assert(prev.lsn < next.lsn);
 
 			if (prev.time > next.time)
