From: Ved-vampir Date: Wed, 8 Apr 2015 17:08:09 +0000 (+0300) Subject: mds: add perf counters descriptions X-Git-Tag: v9.0.0~10^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4304%2Fhead;p=ceph.git mds: add perf counters descriptions Sign-off-by: Alyona Kiseleva --- diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 9700c930dfa8..bcda25159d9b 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -11651,21 +11651,21 @@ void MDCache::register_perfcounters() /* Stray/purge statistics */ pcb.add_u64(l_mdc_num_strays, "num_strays", "Stray dentries", "stry"); - pcb.add_u64(l_mdc_num_strays_purging, "num_strays_purging"); - pcb.add_u64(l_mdc_num_strays_delayed, "num_strays_delayed"); - pcb.add_u64(l_mdc_num_purge_ops, "num_purge_ops"); - pcb.add_u64_counter(l_mdc_strays_created, "strays_created"); + pcb.add_u64(l_mdc_num_strays_purging, "num_strays_purging", "Stray dentries purging"); + pcb.add_u64(l_mdc_num_strays_delayed, "num_strays_delayed", "Stray dentries delayed"); + pcb.add_u64(l_mdc_num_purge_ops, "num_purge_ops", "Purge operations"); + pcb.add_u64_counter(l_mdc_strays_created, "strays_created", "Stray dentries created"); pcb.add_u64_counter(l_mdc_strays_purged, "strays_purged", "Stray dentries purged", "purg"); - pcb.add_u64_counter(l_mdc_strays_reintegrated, "strays_reintegrated"); - pcb.add_u64_counter(l_mdc_strays_migrated, "strays_migrated"); + pcb.add_u64_counter(l_mdc_strays_reintegrated, "strays_reintegrated", "Stray dentries reintegrated"); + pcb.add_u64_counter(l_mdc_strays_migrated, "strays_migrated", "Stray dentries migrated"); /* Recovery queue statistics */ - pcb.add_u64(l_mdc_num_recovering_processing, "num_recovering_processing"); + pcb.add_u64(l_mdc_num_recovering_processing, "num_recovering_processing", "Files currently being recovered"); pcb.add_u64(l_mdc_num_recovering_enqueued, "num_recovering_enqueued", "Files waiting for recovery", "recy"); - pcb.add_u64(l_mdc_num_recovering_prioritized, "num_recovering_prioritized"); - pcb.add_u64_counter(l_mdc_recovery_started, "recovery_started"); + pcb.add_u64(l_mdc_num_recovering_prioritized, "num_recovering_prioritized", "Files waiting for recovery with elevated priority"); + pcb.add_u64_counter(l_mdc_recovery_started, "recovery_started", "File recoveries started"); pcb.add_u64_counter(l_mdc_recovery_completed, "recovery_completed", "File recoveries completed", "recd"); diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 746c1fe4e92e..3eab06114d2e 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -55,25 +55,25 @@ void MDLog::create_logger() plb.add_u64_counter(l_mdl_evadd, "evadd", "Events submitted", "subm"); - plb.add_u64_counter(l_mdl_evex, "evex"); - plb.add_u64_counter(l_mdl_evtrm, "evtrm"); + plb.add_u64_counter(l_mdl_evex, "evex", "Total expired events"); + plb.add_u64_counter(l_mdl_evtrm, "evtrm", "Trimmed events"); plb.add_u64(l_mdl_ev, "ev", "Events", "evts"); - plb.add_u64(l_mdl_evexg, "evexg"); - plb.add_u64(l_mdl_evexd, "evexd"); + plb.add_u64(l_mdl_evexg, "evexg", "Expiring events"); + plb.add_u64(l_mdl_evexd, "evexd", "Current expired events"); - plb.add_u64_counter(l_mdl_segadd, "segadd"); - plb.add_u64_counter(l_mdl_segex, "segex"); - plb.add_u64_counter(l_mdl_segtrm, "segtrm"); + plb.add_u64_counter(l_mdl_segadd, "segadd", "Segments added"); + plb.add_u64_counter(l_mdl_segex, "segex", "Total expired segments"); + plb.add_u64_counter(l_mdl_segtrm, "segtrm", "Trimmed segments"); plb.add_u64(l_mdl_seg, "seg", "Segments", "segs"); - plb.add_u64(l_mdl_segexg, "segexg"); - plb.add_u64(l_mdl_segexd, "segexd"); + plb.add_u64(l_mdl_segexg, "segexg", "Expiring segments"); + plb.add_u64(l_mdl_segexd, "segexd", "Current expired segments"); - 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"); + plb.add_u64(l_mdl_expos, "expos", "Journaler xpire position"); + plb.add_u64(l_mdl_wrpos, "wrpos", "Journaler write position"); + plb.add_u64(l_mdl_rdpos, "rdpos", "Journaler read position"); + plb.add_u64(l_mdl_jlat, "jlat", "Journaler flush latency"); // logger logger = plb.create_perf_counters(); diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index 05a1af545f6e..a1a4edadbea2 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -737,64 +737,64 @@ void MDS::create_logger() { PerfCountersBuilder mds_plb(g_ceph_context, "mds", l_mds_first, l_mds_last); - mds_plb.add_u64_counter(l_mds_request, "request"); - mds_plb.add_u64_counter(l_mds_reply, "reply"); + mds_plb.add_u64_counter(l_mds_request, "request", "Requests"); + mds_plb.add_u64_counter(l_mds_reply, "reply", "Replies"); mds_plb.add_time_avg(l_mds_reply_latency, "reply_latency", "Reply latency", "rlat"); - mds_plb.add_u64_counter(l_mds_forward, "forward"); + mds_plb.add_u64_counter(l_mds_forward, "forward", "Forwarding request"); - mds_plb.add_u64_counter(l_mds_dir_fetch, "dir_fetch"); - mds_plb.add_u64_counter(l_mds_dir_commit, "dir_commit"); - mds_plb.add_u64_counter(l_mds_dir_split, "dir_split"); + mds_plb.add_u64_counter(l_mds_dir_fetch, "dir_fetch", "Directory fetch"); + mds_plb.add_u64_counter(l_mds_dir_commit, "dir_commit", "Directory commit"); + mds_plb.add_u64_counter(l_mds_dir_split, "dir_split", "Directory split"); - mds_plb.add_u64(l_mds_inode_max, "inode_max"); + mds_plb.add_u64(l_mds_inode_max, "inode_max", "Max inodes, cache size"); mds_plb.add_u64(l_mds_inodes, "inodes", "Inodes", "inos"); - mds_plb.add_u64(l_mds_inodes_top, "inodes_top"); - mds_plb.add_u64(l_mds_inodes_bottom, "inodes_bottom"); - mds_plb.add_u64(l_mds_inodes_pin_tail, "inodes_pin_tail"); - mds_plb.add_u64(l_mds_inodes_pinned, "inodes_pinned"); - mds_plb.add_u64(l_mds_inodes_expired, "inodes_expired"); - mds_plb.add_u64(l_mds_inodes_with_caps, "inodes_with_caps"); + mds_plb.add_u64(l_mds_inodes_top, "inodes_top", "Inodes on top"); + mds_plb.add_u64(l_mds_inodes_bottom, "inodes_bottom", "Inodes on bottom"); + mds_plb.add_u64(l_mds_inodes_pin_tail, "inodes_pin_tail", "Inodes on pin tail"); + mds_plb.add_u64(l_mds_inodes_pinned, "inodes_pinned", "Inodes pinned"); + mds_plb.add_u64(l_mds_inodes_expired, "inodes_expired", "Inodes expired"); + mds_plb.add_u64(l_mds_inodes_with_caps, "inodes_with_caps", "Inodes with capabilities"); mds_plb.add_u64(l_mds_caps, "caps", "Capabilities", "caps"); - mds_plb.add_u64(l_mds_subtrees, "subtrees"); + mds_plb.add_u64(l_mds_subtrees, "subtrees", "Subtrees"); - mds_plb.add_u64_counter(l_mds_traverse, "traverse"); - mds_plb.add_u64_counter(l_mds_traverse_hit, "traverse_hit"); - mds_plb.add_u64_counter(l_mds_traverse_forward, "traverse_forward"); - mds_plb.add_u64_counter(l_mds_traverse_discover, "traverse_discover"); - mds_plb.add_u64_counter(l_mds_traverse_dir_fetch, "traverse_dir_fetch"); - mds_plb.add_u64_counter(l_mds_traverse_remote_ino, "traverse_remote_ino"); - mds_plb.add_u64_counter(l_mds_traverse_lock, "traverse_lock"); + mds_plb.add_u64_counter(l_mds_traverse, "traverse", "Traverses"); + mds_plb.add_u64_counter(l_mds_traverse_hit, "traverse_hit", "Traverse hits"); + mds_plb.add_u64_counter(l_mds_traverse_forward, "traverse_forward", "Traverse forwards"); + mds_plb.add_u64_counter(l_mds_traverse_discover, "traverse_discover", "Traverse directory discovers"); + mds_plb.add_u64_counter(l_mds_traverse_dir_fetch, "traverse_dir_fetch", "Traverse incomplete directory content fetchings"); + mds_plb.add_u64_counter(l_mds_traverse_remote_ino, "traverse_remote_ino", "Traverse remote dentries"); + mds_plb.add_u64_counter(l_mds_traverse_lock, "traverse_lock", "Traverse locks"); - mds_plb.add_u64(l_mds_load_cent, "load_cent"); - mds_plb.add_u64(l_mds_dispatch_queue_len, "q"); + mds_plb.add_u64(l_mds_load_cent, "load_cent", "Load per cent"); + mds_plb.add_u64(l_mds_dispatch_queue_len, "q", "Dispatch queue length"); - mds_plb.add_u64_counter(l_mds_exported, "exported"); - mds_plb.add_u64_counter(l_mds_exported_inodes, "exported_inodes"); - mds_plb.add_u64_counter(l_mds_imported, "imported"); - mds_plb.add_u64_counter(l_mds_imported_inodes, "imported_inodes"); + mds_plb.add_u64_counter(l_mds_exported, "exported", "Exports"); + mds_plb.add_u64_counter(l_mds_exported_inodes, "exported_inodes", "Exported inodes"); + mds_plb.add_u64_counter(l_mds_imported, "imported", "Imports"); + mds_plb.add_u64_counter(l_mds_imported_inodes, "imported_inodes", "Imported inodes"); logger = mds_plb.create_perf_counters(); g_ceph_context->get_perfcounters_collection()->add(logger); } { PerfCountersBuilder mdm_plb(g_ceph_context, "mds_mem", l_mdm_first, l_mdm_last); - mdm_plb.add_u64(l_mdm_ino, "ino"); - mdm_plb.add_u64_counter(l_mdm_inoa, "ino+"); - mdm_plb.add_u64_counter(l_mdm_inos, "ino-"); - mdm_plb.add_u64(l_mdm_dir, "dir"); - mdm_plb.add_u64_counter(l_mdm_dira, "dir+"); - mdm_plb.add_u64_counter(l_mdm_dirs, "dir-"); - mdm_plb.add_u64(l_mdm_dn, "dn"); - mdm_plb.add_u64_counter(l_mdm_dna, "dn+"); - mdm_plb.add_u64_counter(l_mdm_dns, "dn-"); - mdm_plb.add_u64(l_mdm_cap, "cap"); - mdm_plb.add_u64_counter(l_mdm_capa, "cap+"); - mdm_plb.add_u64_counter(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"); + mdm_plb.add_u64(l_mdm_ino, "ino", "Inodes"); + mdm_plb.add_u64_counter(l_mdm_inoa, "ino+", "Inodes opened"); + mdm_plb.add_u64_counter(l_mdm_inos, "ino-", "Inodes closed"); + mdm_plb.add_u64(l_mdm_dir, "dir", "Directories"); + mdm_plb.add_u64_counter(l_mdm_dira, "dir+", "Directories opened"); + mdm_plb.add_u64_counter(l_mdm_dirs, "dir-", "Directories closed"); + mdm_plb.add_u64(l_mdm_dn, "dn", "Dentries"); + mdm_plb.add_u64_counter(l_mdm_dna, "dn+", "Dentries opened"); + mdm_plb.add_u64_counter(l_mdm_dns, "dn-", "Dentries closed"); + mdm_plb.add_u64(l_mdm_cap, "cap", "Capabilities"); + mdm_plb.add_u64_counter(l_mdm_capa, "cap+", "Capabilities added"); + mdm_plb.add_u64_counter(l_mdm_caps, "cap-", "Capabilities removed"); + mdm_plb.add_u64(l_mdm_rss, "rss", "RSS"); + mdm_plb.add_u64(l_mdm_heap, "heap", "Heap size"); + mdm_plb.add_u64(l_mdm_malloc, "malloc", "Malloc size"); + mdm_plb.add_u64(l_mdm_buf, "buf", "Buffer size"); mlogger = mdm_plb.create_perf_counters(); g_ceph_context->get_perfcounters_collection()->add(mlogger); } diff --git a/src/mds/Server.cc b/src/mds/Server.cc index eabb15222891..f40897a2a29e 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -96,8 +96,8 @@ void Server::create_logger() "Slave requests", "hsr"); plb.add_u64_counter(l_mdss_handle_client_session, "handle_client_session", "Client session messages", "hcs"); - plb.add_u64_counter(l_mdss_dispatch_client_request, "dispatch_client_request"); - plb.add_u64_counter(l_mdss_dispatch_slave_request, "dispatch_server_request"); + plb.add_u64_counter(l_mdss_dispatch_client_request, "dispatch_client_request", "Client requests dispatched"); + plb.add_u64_counter(l_mdss_dispatch_slave_request, "dispatch_server_request", "Server requests dispatched"); logger = plb.create_perf_counters(); g_ceph_context->get_perfcounters_collection()->add(logger); }