From d2dbae97acc2cb6f80b075adb909b198ae825b1b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Oct 2011 12:45:34 -0700 Subject: [PATCH] osd: clean up perfcounter names Signed-off-by: Sage Weil --- src/osd/OSD.cc | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 634b3b783e35..b0d518edefc4 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -752,54 +752,54 @@ void OSD::create_logger() osd_plb.add_u64(l_osd_op_wip, "op_wip"); // rep ops currently being processed (primary) osd_plb.add_u64_counter(l_osd_op, "op"); // client ops - osd_plb.add_u64_counter(l_osd_op_inb, "op_inb"); // client op in bytes (writes) - osd_plb.add_u64_counter(l_osd_op_outb, "op_outb"); // client op out bytes (reads) - osd_plb.add_fl_avg(l_osd_op_lat, "op_lat"); // client op latency + osd_plb.add_u64_counter(l_osd_op_inb, "op_in_bytes"); // client op in bytes (writes) + osd_plb.add_u64_counter(l_osd_op_outb, "op_out_bytes"); // client op out bytes (reads) + osd_plb.add_fl_avg(l_osd_op_lat, "op_latency"); // client op latency osd_plb.add_u64_counter(l_osd_op_r, "op_r"); // client reads - osd_plb.add_u64_counter(l_osd_op_r_outb, "op_r_outb"); // client read out bytes - osd_plb.add_fl_avg(l_osd_op_r_lat, "op_r_lat"); // client read latency + osd_plb.add_u64_counter(l_osd_op_r_outb, "op_r_out_bytes"); // client read out bytes + osd_plb.add_fl_avg(l_osd_op_r_lat, "op_r_latency"); // client read latency osd_plb.add_u64_counter(l_osd_op_w, "op_w"); // client writes - osd_plb.add_u64_counter(l_osd_op_w_inb, "op_w_inb"); // client write in bytes + osd_plb.add_u64_counter(l_osd_op_w_inb, "op_w_in_bytes"); // client write in bytes osd_plb.add_fl_avg(l_osd_op_w_rlat, "op_w_rlat"); // client write readable/applied latency - osd_plb.add_fl_avg(l_osd_op_w_lat, "op_w_lat"); // client write latency + osd_plb.add_fl_avg(l_osd_op_w_lat, "op_w_latency"); // client write latency osd_plb.add_u64_counter(l_osd_op_rw, "op_rw"); // client rmw - osd_plb.add_u64_counter(l_osd_op_rw_inb, "op_rw_inb"); // client rmw in bytes - osd_plb.add_u64_counter(l_osd_op_rw_outb,"op_rw_outb"); // client rmw out bytes + osd_plb.add_u64_counter(l_osd_op_rw_inb, "op_rw_in_bytes"); // client rmw in bytes + osd_plb.add_u64_counter(l_osd_op_rw_outb,"op_rw_out_bytes"); // client rmw out bytes osd_plb.add_fl_avg(l_osd_op_rw_rlat,"op_rw_rlat"); // client rmw readable/applied latency - osd_plb.add_fl_avg(l_osd_op_rw_lat, "op_rw_lat"); // client rmw latency + osd_plb.add_fl_avg(l_osd_op_rw_lat, "op_rw_latency"); // client rmw latency - osd_plb.add_u64_counter(l_osd_sop, "sop"); // subops - osd_plb.add_u64_counter(l_osd_sop_inb, "sop_inb"); // subop in bytes - osd_plb.add_fl_avg(l_osd_sop_lat, "sop_lat"); // subop latency + osd_plb.add_u64_counter(l_osd_sop, "subop"); // subops + osd_plb.add_u64_counter(l_osd_sop_inb, "subop_in_bytes"); // subop in bytes + osd_plb.add_fl_avg(l_osd_sop_lat, "subop_latency"); // subop latency - osd_plb.add_u64_counter(l_osd_sop_w, "sop_w"); // replicated (client) writes - osd_plb.add_u64_counter(l_osd_sop_w_inb, "sop_w_inb"); // replicated write in bytes - osd_plb.add_fl_avg(l_osd_sop_w_lat, "sop_w_lat"); // replicated write latency - osd_plb.add_u64_counter(l_osd_sop_pull, "sop_pull"); // pull request - osd_plb.add_fl_avg(l_osd_sop_pull_lat, "sop_pull_lat"); - osd_plb.add_u64_counter(l_osd_sop_push, "sop_push"); // push (write) - osd_plb.add_u64_counter(l_osd_sop_push_inb, "sop_push_inb"); - osd_plb.add_fl_avg(l_osd_sop_push_lat, "sop_push_lat"); + osd_plb.add_u64_counter(l_osd_sop_w, "subop_w"); // replicated (client) writes + osd_plb.add_u64_counter(l_osd_sop_w_inb, "subop_w_in_bytes"); // replicated write in bytes + osd_plb.add_fl_avg(l_osd_sop_w_lat, "subop_w_latency"); // replicated write latency + osd_plb.add_u64_counter(l_osd_sop_pull, "subop_pull"); // pull request + osd_plb.add_fl_avg(l_osd_sop_pull_lat, "subop_pull_latency"); + osd_plb.add_u64_counter(l_osd_sop_push, "subop_push"); // push (write) + osd_plb.add_u64_counter(l_osd_sop_push_inb, "subop_push_in_bytes"); + osd_plb.add_fl_avg(l_osd_sop_push_lat, "subop_push_latency"); osd_plb.add_u64_counter(l_osd_pull, "pull"); // pull requests sent osd_plb.add_u64_counter(l_osd_push, "push"); // push messages - osd_plb.add_u64_counter(l_osd_push_outb, "push_outb"); // pushed bytes + osd_plb.add_u64_counter(l_osd_push_outb, "push_out_bytes"); // pushed bytes - osd_plb.add_u64_counter(l_osd_rop, "rop"); // recovery ops (started) + osd_plb.add_u64_counter(l_osd_rop, "recovery_ops"); // recovery ops (started) osd_plb.add_fl(l_osd_loadavg, "loadavg"); - osd_plb.add_u64(l_osd_buf, "buf"); // total ceph::buffer bytes + osd_plb.add_u64(l_osd_buf, "buffer_bytes"); // total ceph::buffer bytes osd_plb.add_u64(l_osd_pg, "numpg"); // num pgs osd_plb.add_u64(l_osd_pg_primary, "numpg_primary"); // num primary pgs osd_plb.add_u64(l_osd_pg_replica, "numpg_replica"); // num replica pgs osd_plb.add_u64(l_osd_pg_stray, "numpg_stray"); // num stray pgs - osd_plb.add_u64(l_osd_hb_to, "hbto"); // heartbeat peers we send to - osd_plb.add_u64(l_osd_hb_from, "hbfrom"); // heartbeat peers we recv from - osd_plb.add_u64_counter(l_osd_map, "map"); // osdmap messages - osd_plb.add_u64_counter(l_osd_mape, "mape"); // osdmap epochs - osd_plb.add_u64_counter(l_osd_mape_dup, "mape_dup"); // dup osdmap epochs + osd_plb.add_u64(l_osd_hb_to, "heartbeat_to_peers"); // heartbeat peers we send to + osd_plb.add_u64(l_osd_hb_from, "heartbeat_from_peers"); // heartbeat peers we recv from + osd_plb.add_u64_counter(l_osd_map, "map_messagse"); // osdmap messages + osd_plb.add_u64_counter(l_osd_mape, "map_message_epochs"); // osdmap epochs + osd_plb.add_u64_counter(l_osd_mape_dup, "map_message_epoch_dups"); // dup osdmap epochs logger = osd_plb.create_perf_counters(); g_ceph_context->GetPerfCountersCollection()->add(logger); -- 2.47.3