common: change default value for perfcounter description ("NO_INFO_FIX">NULL)

Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index f520e1fb1756376e9ca13e17fe5f73b7a8e81947..ecf28f2abeebea125cb842bac07b228312846d8d 100644 (file)
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -292,7 +292,10 @@ void PerfCounters::dump_formatted(Formatter *f, bool schema,
     if (schema) {
       f->open_object_section(d->name);
       f->dump_int("type", d->type);
-      f->dump_string("description", d->description);
+      if (d->description)
+        f->dump_string("description", d->description);
+      else 
+        f->dump_string("description", "");
       f->close_section();
     } else {
       if (d->type & PERFCOUNTER_LONGRUNAVG) {

diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h
index c11e8c2a6bdfdb9ef7074d4b361c417793081dd4..b38a067f9959654cc61993311b81b485ff6cc51b 100644 (file)
--- a/src/common/perf_counters.h
+++ b/src/common/perf_counters.h
@@ -239,11 +239,11 @@ public:
   PerfCountersBuilder(CephContext *cct, const std::string &name,
                    int first, int last);
   ~PerfCountersBuilder();
-  void add_u64(int key, const char *name, const char *description = "NO_INFO_FIX");
-  void add_u64_counter(int key, const char *name, const char *description = "NO_INFO_FIX");
-  void add_u64_avg(int key, const char *name, const char *description = "NO_INFO_FIX");
-  void add_time(int key, const char *name, const char *description = "NO_INFO_FIX");
-  void add_time_avg(int key, const char *name, const char *description = "NO_INFO_FIX");
+  void add_u64(int key, const char *name, const char *description = NULL);
+  void add_u64_counter(int key, const char *name, const char *description = NULL);
+  void add_u64_avg(int key, const char *name, const char *description = NULL);
+  void add_time(int key, const char *name, const char *description = NULL);
+  void add_time_avg(int key, const char *name, const char *description = NULL);
   PerfCounters* create_perf_counters();
 private:
   PerfCountersBuilder(const PerfCountersBuilder &rhs);

diff --git a/src/test/perf_counters.cc b/src/test/perf_counters.cc
index 1a93db42f784c5f9c2d5d5404c8bb46ea1cd015d..1468d806a163bb15e2677d1772d4de5121c216b0 100644 (file)
--- a/src/test/perf_counters.cc
+++ b/src/test/perf_counters.cc
@@ -182,8 +182,8 @@ TEST(PerfCounters, MultiplePerfCounters) {
            "\"element3\":{\"avgcount\":0,\"sum\":0.000000000}}}"), msg);
   ASSERT_EQ("", client.do_request("{ \"prefix\": \"perf schema\", \"format\": \"json\" }", &msg));
 
-  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":{\"type\":2,\"description\":\"NO_INFO_FIX\"},"
-              "\"element2\":{\"type\":1,\"description\":\"NO_INFO_FIX\"},\"element3\":{\"type\":5,\"description\":\"NO_INFO_FIX\"}}}"), msg);
+  ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":{\"type\":2,\"description\":\"\"},"
+              "\"element2\":{\"type\":1,\"description\":\"\"},\"element3\":{\"type\":5,\"description\":\"\"}}}"), msg);
 
   coll->clear();
   ASSERT_EQ("", client.do_request("{ \"prefix\": \"perf dump\", \"format\": \"json\" }", &msg));