From: Bryan Mayland <bmayland@capnbry.net>
Date: Fri, 7 Jun 2013 16:20:06 +0000 (-0400)
Subject: Update a maximum of row_cnt rows when updating an rra
X-Git-Tag: v1.5.0-rc1~163^2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F399%2Fhead;p=thirdparty%2Frrdtool-1.x.git

Update a maximum of row_cnt rows when updating an rra
---

diff --git a/src/rrd_update.c b/src/rrd_update.c
index 1529772a..2ab9ccec 100644
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -1476,8 +1476,9 @@ static int update_all_cdp_prep(
             proc_pdp_cnt % rrd->rra_def[rra_idx].pdp_cnt;
         skip_update[rra_idx] = 0;
         if (start_pdp_offset <= elapsed_pdp_st) {
-            rra_step_cnt[rra_idx] = (elapsed_pdp_st - start_pdp_offset) /
-                rrd->rra_def[rra_idx].pdp_cnt + 1;
+            rra_step_cnt[rra_idx] = min((elapsed_pdp_st - start_pdp_offset) /
+                rrd->rra_def[rra_idx].pdp_cnt + 1,
+                rrd->rra_def[rra_idx].row_cnt);
         } else {
             rra_step_cnt[rra_idx] = 0;
         }