From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 30 Oct 2015 06:08:37 +0000 (+0000)
Subject: jobqueue: Pass count value delta instead of $type for the inserts_actual metric
X-Git-Tag: 1.31.0-rc.0~9167
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=f4801e7f1400a1173a002423bf046c128ad70dcb;p=lhc%2Fweb%2Fwiklou.git

jobqueue: Pass count value delta instead of $type for the inserts_actual metric

Follows-up 4844595. Which wrongly passed the delta as $type parameter.
This resulted in the creation of "jobqueue.inserts_actual.50" and other
random buckets.

The "all" key also got incremented with 1, but doesn't reflect the actual
value in any meaningful way (besides the number of data points pushed
to statsd).

Change-Id: Ic93e06946ce3fcf0c21d2b7504fb10b3711c6e2b
---

diff --git a/includes/jobqueue/JobQueueRedis.php b/includes/jobqueue/JobQueueRedis.php
index 1e957c2342..deb5aa5a3a 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -219,7 +219,7 @@ class JobQueueRedis extends JobQueue {
 				}
 			}
 			JobQueue::incrStats( 'inserts', $this->type, count( $items ) );
-			JobQueue::incrStats( 'inserts_actual', $pushed );
+			JobQueue::incrStats( 'inserts_actual', $this->type, $pushed );
 			JobQueue::incrStats( 'dupe_inserts', $this->type,
 				count( $items ) - $failed - $pushed );
 			if ( $failed > 0 ) {