From: John Spray <john.spray@redhat.com>
Date: Tue, 12 Aug 2014 16:45:40 +0000 (+0100)
Subject: common: fix Finisher perf counter
X-Git-Tag: v0.86~213^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6373112060cae6ad7d38e3849b482c2da1736eea;p=ceph.git

common: fix Finisher perf counter

This was declared as a long running average
but then .dec() was called on it, which
triggers an assertion.

You only have this problem if you pass a name
argument to Finisher::Finisher, which we mostly
don't do, but may as well fix this anyway.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/Finisher.h b/src/common/Finisher.h
index 229342079d8d..236fecf3f6a0 100644
--- a/src/common/Finisher.h
+++ b/src/common/Finisher.h
@@ -104,7 +104,7 @@ class Finisher {
     finisher_thread(this) {
     PerfCountersBuilder b(cct, string("finisher-") + name,
 			  l_finisher_first, l_finisher_last);
-    b.add_time_avg(l_finisher_queue_len, "queue_len");
+    b.add_u64(l_finisher_queue_len, "queue_len");
     logger = b.create_perf_counters();
     cct->get_perfcounters_collection()->add(logger);
     logger->set(l_finisher_queue_len, 0);