From 73cf6b89787a279ed3fc462f1f89947dade49804 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Mon, 18 Jul 2011 13:13:49 -0700 Subject: [PATCH] ProfLoggerBuilder: new API There are now three different types of variables that can be created: u64, float, float average. The distinction between "inc" and "set" variables is gone, since there will be no clearing of variables in the new Proflogger. Signed-off-by: Colin McCabe --- src/client/Client.cc | 10 ++-- src/common/ProfLogger.h | 9 ++- src/mds/MDLog.cc | 36 ++++++------ src/mds/MDS.cc | 126 ++++++++++++++++++++-------------------- src/mds/Server.cc | 10 ++-- src/os/FileStore.cc | 40 ++++++------- src/osd/OSD.cc | 104 ++++++++++++++++----------------- 7 files changed, 167 insertions(+), 168 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 2ee746155d43f..3543031c45099 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -311,11 +311,11 @@ void Client::init() snprintf(s, sizeof(s), "clients.%s.%d", hostname, getpid()); ProfLoggerBuilder plb(cct, s, l_c_first, l_c_last); if (client_logger == 0) { - plb.add_inc(l_c_reply, "reply"); - plb.add_avg(l_c_lat, "lat"); - plb.add_avg(l_c_wrlat, "wrlat"); - plb.add_avg(l_c_owrlat, "owrlat"); - plb.add_avg(l_c_ordlat, "ordlat"); + plb.add_fl_avg(l_c_reply, "reply"); + plb.add_fl_avg(l_c_lat, "lat"); + plb.add_fl_avg(l_c_wrlat, "wrlat"); + plb.add_fl_avg(l_c_owrlat, "owrlat"); + plb.add_fl_avg(l_c_ordlat, "ordlat"); client_logger = plb.create_proflogger(); } diff --git a/src/common/ProfLogger.h b/src/common/ProfLogger.h index 4600881b8b35e..f64e8c42bd1d7 100644 --- a/src/common/ProfLogger.h +++ b/src/common/ProfLogger.h @@ -126,16 +126,15 @@ public: m_plt = new ProfLogType(first, last); } - void add_inc(int key, const char *name) { + void add_u64(int key, const char *name) { m_plt->add_inc(key, name); } - void add_set(int key, const char *name) { - m_plt->add_set(key, name); + void add_fl(int key, const char *name) { + m_plt->add_inc(key, name); } - void add_avg(int key, const char *name) { + void add_fl_avg(int key, const char *name) { m_plt->add_avg(key, name); } - ProfLogger* create_proflogger() { // TODO: remove m_plt m_plt->validate(); diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 7125c321afd4c..bf2d67c42341e 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -50,24 +50,24 @@ void MDLog::open_logger() snprintf(name, sizeof(name), "mds.%s.log", g_conf->name.get_id().c_str()); ProfLoggerBuilder plb(g_ceph_context, name, l_mdl_first, l_mdl_last); - plb.add_inc(l_mdl_evadd, "evadd"); - plb.add_inc(l_mdl_evex, "evex"); - plb.add_inc(l_mdl_evtrm, "evtrm"); - plb.add_set(l_mdl_ev, "ev"); - plb.add_set(l_mdl_evexg, "evexg"); - plb.add_set(l_mdl_evexd, "evexd"); - - plb.add_inc(l_mdl_segadd, "segadd"); - plb.add_inc(l_mdl_segex, "segex"); - plb.add_inc(l_mdl_segtrm, "segtrm"); - plb.add_set(l_mdl_seg, "seg"); - plb.add_set(l_mdl_segexg, "segexg"); - plb.add_set(l_mdl_segexd, "segexd"); - - plb.add_set(l_mdl_expos, "expos"); - plb.add_set(l_mdl_wrpos, "wrpos"); - plb.add_set(l_mdl_rdpos, "rdpos"); - plb.add_avg(l_mdl_jlat, "jlat"); + plb.add_u64(l_mdl_evadd, "evadd"); + plb.add_u64(l_mdl_evex, "evex"); + plb.add_u64(l_mdl_evtrm, "evtrm"); + plb.add_u64(l_mdl_ev, "ev"); + plb.add_u64(l_mdl_evexg, "evexg"); + plb.add_u64(l_mdl_evexd, "evexd"); + + plb.add_u64(l_mdl_segadd, "segadd"); + plb.add_u64(l_mdl_segex, "segex"); + plb.add_u64(l_mdl_segtrm, "segtrm"); + plb.add_u64(l_mdl_seg, "seg"); + plb.add_u64(l_mdl_segexg, "segexg"); + plb.add_u64(l_mdl_segexd, "segexd"); + + plb.add_u64(l_mdl_expos, "expos"); + plb.add_u64(l_mdl_wrpos, "wrpos"); + plb.add_u64(l_mdl_rdpos, "rdpos"); + plb.add_u64(l_mdl_jlat, "jlat"); // logger logger = plb.create_proflogger(); diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index eba0fc7de24ec..ff285d39950b9 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -197,61 +197,61 @@ void MDS::open_logger() ProfLoggerBuilder mds_plb(g_ceph_context, name, l_mds_first, l_mds_last); - mds_plb.add_inc(l_mds_req, "req"); - mds_plb.add_inc(l_mds_reply, "reply"); - mds_plb.add_avg(l_mds_replyl, "replyl"); - mds_plb.add_inc(l_mds_fw, "fw"); + mds_plb.add_u64(l_mds_req, "req"); // FIXME: nobody is actually setting this + mds_plb.add_u64(l_mds_reply, "reply"); + mds_plb.add_fl_avg(l_mds_replyl, "replyl"); + mds_plb.add_u64(l_mds_fw, "fw"); - mds_plb.add_inc(l_mds_dir_f, "dir_f"); - mds_plb.add_inc(l_mds_dir_c, "dir_c"); - mds_plb.add_inc(l_mds_dir_sp, "dir_sp"); - mds_plb.add_inc(l_mds_dir_ffc, "dir_ffc"); - //mds_plb.add_inc("mkdir"); + mds_plb.add_u64(l_mds_dir_f, "dir_f"); + mds_plb.add_u64(l_mds_dir_c, "dir_c"); + mds_plb.add_u64(l_mds_dir_sp, "dir_sp"); + mds_plb.add_u64(l_mds_dir_ffc, "dir_ffc"); + //mds_plb.add_u64("mkdir"); /* - mds_plb.add_inc("newin"); // new inodes (pre)loaded - mds_plb.add_inc("newt"); // inodes first touched/used - mds_plb.add_inc("outt"); // trimmed touched - mds_plb.add_inc("outut"); // trimmed untouched (wasted effort) - mds_plb.add_avg("oututl"); // avg trim latency for untouched - - mds_plb.add_inc("dirt1"); - mds_plb.add_inc("dirt2"); - mds_plb.add_inc("dirt3"); - mds_plb.add_inc("dirt4"); - mds_plb.add_inc("dirt5"); + mds_plb.add_u64("newin"); // new inodes (pre)loaded + mds_plb.add_u64("newt"); // inodes first touched/used + mds_plb.add_u64("outt"); // trimmed touched + mds_plb.add_u64("outut"); // trimmed untouched (wasted effort) + mds_plb.add_fl_avg("oututl"); // avg trim latency for untouched + + mds_plb.add_u64("dirt1"); + mds_plb.add_u64("dirt2"); + mds_plb.add_u64("dirt3"); + mds_plb.add_u64("dirt4"); + mds_plb.add_u64("dirt5"); */ - mds_plb.add_set(l_mds_imax, "imax"); - mds_plb.add_set(l_mds_i, "i"); - mds_plb.add_set(l_mds_itop, "itop"); - mds_plb.add_set(l_mds_ibot, "ibot"); - mds_plb.add_set(l_mds_iptail, "iptail"); - mds_plb.add_set(l_mds_ipin, "ipin"); - mds_plb.add_inc(l_mds_iex, "iex"); - mds_plb.add_inc(l_mds_icap, "icap"); - mds_plb.add_inc(l_mds_cap, "cap"); + mds_plb.add_u64(l_mds_imax, "imax"); + mds_plb.add_u64(l_mds_i, "i"); + mds_plb.add_u64(l_mds_itop, "itop"); + mds_plb.add_u64(l_mds_ibot, "ibot"); + mds_plb.add_u64(l_mds_iptail, "iptail"); + mds_plb.add_u64(l_mds_ipin, "ipin"); + mds_plb.add_u64(l_mds_iex, "iex"); + mds_plb.add_u64(l_mds_icap, "icap"); + mds_plb.add_u64(l_mds_cap, "cap"); - mds_plb.add_inc(l_mds_dis, "dis"); - - mds_plb.add_inc(l_mds_t, "t"); - mds_plb.add_inc(l_mds_thit, "thit"); - mds_plb.add_inc(l_mds_tfw, "tfw"); - mds_plb.add_inc(l_mds_tdis, "tdis"); - mds_plb.add_inc(l_mds_tdirf, "tdirf"); - mds_plb.add_inc(l_mds_trino, "trino"); - mds_plb.add_inc(l_mds_tlock, "tlock"); + mds_plb.add_u64(l_mds_dis, "dis"); // FIXME: unused + + mds_plb.add_u64(l_mds_t, "t"); + mds_plb.add_u64(l_mds_thit, "thit"); + mds_plb.add_u64(l_mds_tfw, "tfw"); + mds_plb.add_u64(l_mds_tdis, "tdis"); + mds_plb.add_u64(l_mds_tdirf, "tdirf"); + mds_plb.add_u64(l_mds_trino, "trino"); + mds_plb.add_u64(l_mds_tlock, "tlock"); - mds_plb.add_set(l_mds_l, "l"); - mds_plb.add_set(l_mds_q, "q"); - mds_plb.add_set(l_mds_popanyd, "popanyd"); - mds_plb.add_set(l_mds_popnest, "popnest"); + mds_plb.add_fl(l_mds_l, "l"); + mds_plb.add_u64(l_mds_q, "q"); + mds_plb.add_u64(l_mds_popanyd, "popanyd"); // FIXME: unused + mds_plb.add_u64(l_mds_popnest, "popnest"); - mds_plb.add_set(l_mds_sm, "sm"); - mds_plb.add_inc(l_mds_ex, "ex"); - mds_plb.add_inc(l_mds_iexp, "iexp"); - mds_plb.add_inc(l_mds_im, "im"); - mds_plb.add_inc(l_mds_iim, "iim"); + mds_plb.add_u64(l_mds_sm, "sm"); + mds_plb.add_u64(l_mds_ex, "ex"); + mds_plb.add_u64(l_mds_iexp, "iexp"); + mds_plb.add_u64(l_mds_im, "im"); + mds_plb.add_u64(l_mds_iim, "iim"); logger = mds_plb.create_proflogger(); g_ceph_context->GetProfLoggerCollection()->logger_add(logger); } @@ -263,22 +263,22 @@ void MDS::open_logger() (unsigned long long) monc->get_global_id()); ProfLoggerBuilder mdm_plb(g_ceph_context, name, l_mdm_first, l_mdm_last); - mdm_plb.add_set(l_mdm_ino, "ino"); - mdm_plb.add_inc(l_mdm_inoa, "ino+"); - mdm_plb.add_inc(l_mdm_inos, "ino-"); - mdm_plb.add_set(l_mdm_dir, "dir"); - mdm_plb.add_inc(l_mdm_dira, "dir+"); - mdm_plb.add_inc(l_mdm_dirs, "dir-"); - mdm_plb.add_set(l_mdm_dn, "dn"); - mdm_plb.add_inc(l_mdm_dna, "dn+"); - mdm_plb.add_inc(l_mdm_dns, "dn-"); - mdm_plb.add_set(l_mdm_cap, "cap"); - mdm_plb.add_inc(l_mdm_capa, "cap+"); - mdm_plb.add_inc(l_mdm_caps, "cap-"); - mdm_plb.add_set(l_mdm_rss, "rss"); - mdm_plb.add_set(l_mdm_heap, "heap"); - mdm_plb.add_set(l_mdm_malloc, "malloc"); - mdm_plb.add_set(l_mdm_buf, "buf"); + mdm_plb.add_u64(l_mdm_ino, "ino"); + mdm_plb.add_u64(l_mdm_inoa, "ino+"); + mdm_plb.add_u64(l_mdm_inos, "ino-"); + mdm_plb.add_u64(l_mdm_dir, "dir"); + mdm_plb.add_u64(l_mdm_dira, "dir+"); + mdm_plb.add_u64(l_mdm_dirs, "dir-"); + mdm_plb.add_u64(l_mdm_dn, "dn"); + mdm_plb.add_u64(l_mdm_dna, "dn+"); + mdm_plb.add_u64(l_mdm_dns, "dn-"); + mdm_plb.add_u64(l_mdm_cap, "cap"); + mdm_plb.add_u64(l_mdm_capa, "cap+"); + mdm_plb.add_u64(l_mdm_caps, "cap-"); + mdm_plb.add_u64(l_mdm_rss, "rss"); + mdm_plb.add_u64(l_mdm_heap, "heap"); + mdm_plb.add_u64(l_mdm_malloc, "malloc"); + mdm_plb.add_u64(l_mdm_buf, "buf"); mlogger = mdm_plb.create_proflogger(); g_ceph_context->GetProfLoggerCollection()->logger_add(mlogger); } diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 0976182a795fc..8a6ce3e314d11 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -69,11 +69,11 @@ void Server::open_logger() char name[80]; snprintf(name, sizeof(name), "mds.%s.server.log", g_conf->name.get_id().c_str()); ProfLoggerBuilder plb(g_ceph_context, name, l_mdss_first, l_mdss_last); - plb.add_inc(l_mdss_hcreq,"hcreq"); // handle client req - plb.add_inc(l_mdss_hsreq, "hsreq"); // slave - plb.add_inc(l_mdss_hcsess, "hcsess"); // client session - plb.add_inc(l_mdss_dcreq, "dcreq"); // dispatch client req - plb.add_inc(l_mdss_dsreq, "dsreq"); // slave + plb.add_u64(l_mdss_hcreq,"hcreq"); // handle client req + plb.add_u64(l_mdss_hsreq, "hsreq"); // slave + plb.add_u64(l_mdss_hcsess, "hcsess"); // client session + plb.add_u64(l_mdss_dcreq, "dcreq"); // dispatch client req + plb.add_u64(l_mdss_dsreq, "dsreq"); // slave logger = plb.create_proflogger(); g_ceph_context->GetProfLoggerCollection()->logger_add(logger); } diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index fe4759d1dd0a0..78b85dd33d1e5 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1885,26 +1885,26 @@ void FileStore::start_logger(int whoami, utime_t tare) snprintf(name, sizeof(name), "osd.%d.fs.log", whoami); ProfLoggerBuilder plb(g_ceph_context, name, l_os_first, l_os_last); - plb.add_inc(l_os_in_ops, "in_o"); - //plb.add_inc(l_os_in_bytes, "in_b"); - plb.add_inc(l_os_readable_ops, "or_o"); - plb.add_inc(l_os_readable_bytes, "or_b"); - //plb.add_inc(l_os_commit_bytes, "com_o"); - //plb.add_inc(l_os_commit_bytes, "com_b"); - - plb.add_set(l_os_jq_max_ops, "jq_mo"); - plb.add_set(l_os_jq_ops, "jq_o"); - plb.add_inc(l_os_j_ops, "j_o"); - plb.add_set(l_os_jq_max_bytes, "jq_mb"); - plb.add_set(l_os_jq_bytes, "jq_b"); - plb.add_inc(l_os_j_bytes, "j_b"); - plb.add_set(l_os_oq_max_ops, "oq_mo"); - plb.add_set(l_os_oq_ops, "oq_o"); - plb.add_inc(l_os_ops, "o"); - plb.add_set(l_os_oq_max_bytes, "oq_mb"); - plb.add_set(l_os_oq_bytes, "oq_b"); - plb.add_inc(l_os_bytes, "b"); - plb.add_set(l_os_committing, "comitng"); + plb.add_u64(l_os_in_ops, "in_o"); + //plb.add_u64(l_os_in_bytes, "in_b"); + plb.add_u64(l_os_readable_ops, "or_o"); + plb.add_u64(l_os_readable_bytes, "or_b"); + //plb.add_u64(l_os_commit_bytes, "com_o"); + //plb.add_u64(l_os_commit_bytes, "com_b"); + + plb.add_u64(l_os_jq_max_ops, "jq_mo"); + plb.add_u64(l_os_jq_ops, "jq_o"); + plb.add_u64(l_os_j_ops, "j_o"); + plb.add_u64(l_os_jq_max_bytes, "jq_mb"); + plb.add_u64(l_os_jq_bytes, "jq_b"); + plb.add_u64(l_os_j_bytes, "j_b"); + plb.add_u64(l_os_oq_max_ops, "oq_mo"); + plb.add_u64(l_os_oq_ops, "oq_o"); + plb.add_u64(l_os_ops, "o"); + plb.add_u64(l_os_oq_max_bytes, "oq_mb"); + plb.add_u64(l_os_oq_bytes, "oq_b"); + plb.add_u64(l_os_bytes, "b"); + plb.add_u64(l_os_committing, "comitng"); logger = plb.create_proflogger(); if (journal) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 3bc08ce4b5d2e..945864d059717 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -629,58 +629,58 @@ void OSD::open_logger() snprintf(name, sizeof(name), "osd.%d.log", whoami); ProfLoggerBuilder osd_plb(g_ceph_context, name, l_osd_first, l_osd_last); - osd_plb.add_set(l_osd_opq, "opq"); // op queue length (waiting to be processed yet) - osd_plb.add_set(l_osd_op_wip, "op_wip"); // rep ops currently being processed (primary) - - osd_plb.add_inc(l_osd_op, "op"); // client ops - osd_plb.add_inc(l_osd_op_inb, "op_inb"); // client op in bytes (writes) - osd_plb.add_inc(l_osd_op_outb, "op_outb"); // client op out bytes (reads) - osd_plb.add_inc(l_osd_op_lat, "op_lat"); // client op latency - - osd_plb.add_inc(l_osd_op_r, "op_r"); // client reads - osd_plb.add_inc(l_osd_op_r_outb, "op_r_outb"); // client read out bytes - osd_plb.add_inc(l_osd_op_r_lat, "op_r_lat"); // client read latency - osd_plb.add_inc(l_osd_op_w, "op_w"); // client writes - osd_plb.add_inc(l_osd_op_w_inb, "op_w_inb"); // client write in bytes - osd_plb.add_inc(l_osd_op_w_rlat, "op_w_rlat"); // client write readable/applied latency - osd_plb.add_inc(l_osd_op_w_lat, "op_w_lat"); // client write latency - osd_plb.add_inc(l_osd_op_rw, "op_rw"); // client rmw - osd_plb.add_inc(l_osd_op_rw_inb, "op_rw_inb"); // client rmw in bytes - osd_plb.add_inc(l_osd_op_rw_outb,"op_rw_outb"); // client rmw out bytes - osd_plb.add_inc(l_osd_op_rw_rlat,"op_rw_rlat"); // client rmw readable/applied latency - osd_plb.add_inc(l_osd_op_rw_lat, "op_rw_lat"); // client rmw latency - - osd_plb.add_inc(l_osd_sop, "sop"); // subops - osd_plb.add_inc(l_osd_sop_inb, "sop_inb"); // subop in bytes - osd_plb.add_inc(l_osd_sop_lat, "sop_lat"); // subop latency - - osd_plb.add_inc(l_osd_sop_w, "sop_w"); // replicated (client) writes - osd_plb.add_inc(l_osd_sop_w_inb, "sop_w_inb"); // replicated write in bytes - osd_plb.add_inc(l_osd_sop_w_lat, "sop_w_lat"); // replicated write latency - osd_plb.add_inc(l_osd_sop_pull, "sop_pull"); // pull request - osd_plb.add_inc(l_osd_sop_pull_lat, "sop_pull_lat"); - osd_plb.add_inc(l_osd_sop_push, "sop_push"); // push (write) - osd_plb.add_inc(l_osd_sop_push_inb, "sop_push_inb"); - osd_plb.add_inc(l_osd_sop_push_lat, "sop_push_lat"); - - osd_plb.add_inc(l_osd_pull, "pull"); // pull requests sent - osd_plb.add_inc(l_osd_push, "push"); // push messages - osd_plb.add_inc(l_osd_push_outb, "push_outb"); // pushed bytes - - osd_plb.add_inc(l_osd_rop, "rop"); // recovery ops (started) - - osd_plb.add_set(l_osd_loadavg, "loadavg"); - osd_plb.add_set(l_osd_buf, "buf"); // total ceph::buffer bytes - - osd_plb.add_set(l_osd_pg, "numpg"); // num pgs - osd_plb.add_set(l_osd_pg_primary, "numpg_primary"); // num primary pgs - osd_plb.add_set(l_osd_pg_replica, "numpg_replica"); // num replica pgs - osd_plb.add_set(l_osd_pg_stray, "numpg_stray"); // num stray pgs - osd_plb.add_set(l_osd_hb_to, "hbto"); // heartbeat peers we send to - osd_plb.add_set(l_osd_hb_from, "hbfrom"); // heartbeat peers we recv from - osd_plb.add_inc(l_osd_map, "map"); // osdmap messages - osd_plb.add_inc(l_osd_mape, "mape"); // osdmap epochs - osd_plb.add_inc(l_osd_mape_dup, "mape_dup"); // dup osdmap epochs + osd_plb.add_u64(l_osd_opq, "opq"); // op queue length (waiting to be processed yet) + osd_plb.add_u64(l_osd_op_wip, "op_wip"); // rep ops currently being processed (primary) + + osd_plb.add_u64(l_osd_op, "op"); // client ops + osd_plb.add_u64(l_osd_op_inb, "op_inb"); // client op in bytes (writes) + osd_plb.add_u64(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(l_osd_op_r, "op_r"); // client reads + osd_plb.add_u64(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(l_osd_op_w, "op_w"); // client writes + osd_plb.add_u64(l_osd_op_w_inb, "op_w_inb"); // 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_u64(l_osd_op_rw, "op_rw"); // client rmw + osd_plb.add_u64(l_osd_op_rw_inb, "op_rw_inb"); // client rmw in bytes + osd_plb.add_u64(l_osd_op_rw_outb,"op_rw_outb"); // 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_u64(l_osd_sop, "sop"); // subops + osd_plb.add_u64(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(l_osd_sop_w, "sop_w"); // replicated (client) writes + osd_plb.add_u64(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(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(l_osd_sop_push, "sop_push"); // push (write) + osd_plb.add_u64(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(l_osd_pull, "pull"); // pull requests sent + osd_plb.add_u64(l_osd_push, "push"); // push messages + osd_plb.add_u64(l_osd_push_outb, "push_outb"); // pushed bytes + + osd_plb.add_u64(l_osd_rop, "rop"); // 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_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(l_osd_map, "map"); // osdmap messages + osd_plb.add_u64(l_osd_mape, "mape"); // osdmap epochs + osd_plb.add_u64(l_osd_mape_dup, "mape_dup"); // dup osdmap epochs logger = osd_plb.create_proflogger(); g_ceph_context->GetProfLoggerCollection()->logger_add(logger); -- 2.39.5