rgw: Add get bytes for labeled perf counters

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index cbe1793a3f3ed32c18728452f47347aa82cfb5b1..5f51d7e3aa89dab213038d04feb4f04d833e5577 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2153,6 +2153,7 @@ void RGWGetObj::execute(optional_yield y)
   std::unique_ptr<RGWGetObj_Filter> decrypt;
   std::unique_ptr<RGWGetObj_Filter> run_lua;
   map<string, bufferlist>::iterator attr_iter;
+  std::string labels;
 
   perfcounter->inc(l_rgw_get);
 
@@ -2321,6 +2322,11 @@ void RGWGetObj::execute(optional_yield y)
     return;
   }
 
+  labels = ceph::perf_counters::cache_key("z_rgw", {{"Bucket", s->bucket_name}, {"User", s->user->get_display_name()}});
+  //ldpp_dout(this, 20) << "labels for perf counters cache: " << labels << dendl;
+  perf_counters_cache->add(labels);
+  perf_counters_cache->inc(labels, l_rgw_metrics_get_b, s->obj_size);
+
   perfcounter->inc(l_rgw_get_b, end - ofs);
 
   op_ret = read_op->iterate(this, ofs_x, end_x, filter, s->yield);
@@ -4166,7 +4172,7 @@ void RGWPutObj::execute(optional_yield y)
   s->obj_size = ofs;
   s->object->set_obj_size(ofs);
 
-  std::string labels = ceph::perf_counters::cache_key("rgw_perfcounters_cache", {{"Bucket", s->bucket_name}, {"User", s->user->get_display_name()}});
+  std::string labels = ceph::perf_counters::cache_key("z_rgw", {{"Bucket", s->bucket_name}, {"User", s->user->get_display_name()}});
   //ldpp_dout(this, 20) << "labels for perf counters cache: " << labels << dendl;
   perf_counters_cache->add(labels);
   perf_counters_cache->inc(labels, l_rgw_metrics_put_b, s->obj_size);