Fix WAL file cutoff point calculation in pg_standby.

hlinnaka · hlinnaka · commit cac2f697ee21 · 2008-07-08T15:11:58.000Z
Patch by Simon Riggs, per bug report from Ferenc Felhoffer
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.12 2008/05/17 01:28:21 adunstan Exp $ 
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.13 2008/07/08 15:11:58 heikki Exp $ 
  *
  *
  * pg_standby.c
@@ -323,7 +323,7 @@ SetWALFileNameForCleanup(void)
 			if (seg_diff > seg)
 			{
 				log_diff++;
-				seg = MaxSegmentsPerLogFile - seg_diff;
+				seg = MaxSegmentsPerLogFile - (seg_diff - seg);
 			}
 			else
 				seg -= seg_diff;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.12 2008/05/17 01:28:21 adunstan Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.13 2008/07/08 15:11:58 heikki Exp $`
`3`	`3`	`*`
`4`	`4`	`*`
`5`	`5`	`* pg_standby.c`
`@@ -323,7 +323,7 @@ SetWALFileNameForCleanup(void)`
`323`	`323`	`if (seg_diff > seg)`
`324`	`324`	`{`
`325`	`325`	`log_diff++;`
`326`		`- seg = MaxSegmentsPerLogFile - seg_diff;`
	`326`	`+ seg = MaxSegmentsPerLogFile - (seg_diff - seg);`
`327`	`327`	`}`
`328`	`328`	`else`
`329`	`329`	`seg -= seg_diff;`