aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2007-06-08 21:21:28 +0000
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2007-06-08 21:21:28 +0000
commita4d58727191419b89126f06f23237986cae966fc (patch)
treeac68091e0f275327086ffa4a8e0d9ff01da4a8cf /src
parent2b438c12cca443fe69852e9b0c678893c8686ac0 (diff)
downloadpostgresql-a4d58727191419b89126f06f23237986cae966fc.tar.gz
postgresql-a4d58727191419b89126f06f23237986cae966fc.zip
Disallow the cost balancing code from resulting in a zero cost limit, which
causes a division-by-zero error in the vacuum code. This can happen when there are more workers than cost limit units. Per report from Galy Lee in <200705310914.l4V9E6JA094603@wwwmaster.postgresql.org>.
Diffstat (limited to 'src')
-rw-r--r--src/backend/postmaster/autovacuum.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 07bf40707e3..82a2bc71a0c 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.48 2007/06/08 21:09:49 alvherre Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.49 2007/06/08 21:21:28 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1599,7 +1599,11 @@ autovac_balance_cost(void)
int limit = (int)
(cost_avail * worker->wi_cost_limit_base / cost_total);
- worker->wi_cost_limit = Min(limit, worker->wi_cost_limit_base);
+ /*
+ * We put a lower bound of 1 to the cost_limit, to avoid division-
+ * by-zero in the vacuum code.
+ */
+ worker->wi_cost_limit = Max(Min(limit, worker->wi_cost_limit_base), 1);
elog(DEBUG2, "autovac_balance_cost(pid=%u db=%u, rel=%u, cost_limit=%d, cost_delay=%d)",
worker->wi_workerpid, worker->wi_dboid,