From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Fri, 14 Jul 2017 22:15:53 +0000 (+0800)
Subject: test/fio: print all perfcounters rather than objectstore itself.
X-Git-Tag: v12.1.1~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ab14d1df72f546962c7375e721b39b767e46c9e;p=ceph.git

test/fio: print all perfcounters rather than objectstore itself.

Need bluefs,rocksdb perfcounters.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc
index 604c44c59f1d..716e1d6ec59b 100644
--- a/src/test/fio/fio_ceph_objectstore.cc
+++ b/src/test/fio/fio_ceph_objectstore.cc
@@ -17,6 +17,7 @@
 #include "common/errno.h"
 #include "include/intarith.h"
 #include "include/stringify.h"
+#include "common/perf_counters.h"
 
 #include <fio.h>
 #include <optgroup.h>
@@ -86,7 +87,7 @@ struct Engine {
     if (!ref_count) {
       ostringstream ostr;
       Formatter* f = Formatter::create("json-pretty", "json-pretty", "json-pretty");
-      os->dump_perf_counters(f);
+      cct->get_perfcounters_collection()->dump_formatted(f, false);
       ostr << "FIO plugin ";
       f->flush(ostr);
       if (g_conf->rocksdb_perf) {