From: Sage Weil Date: Tue, 28 Mar 2017 02:54:11 +0000 (-0400) Subject: osd: clean up whitespace in create_logger() X-Git-Tag: v12.0.3~71^2~22 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b1410b12787f0658595da02740dd17aa941d593;p=ceph.git osd: clean up whitespace in create_logger() Signed-off-by: Sage Weil --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e58f272c8cb4..6710d22b64e3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2741,145 +2741,220 @@ void OSD::create_logger() }; - osd_plb.add_u64(l_osd_op_wip, "op_wip", - "Replication operations currently being processed (primary)"); // rep ops currently being processed (primary) - osd_plb.add_u64_counter(l_osd_op, "op", - "Client operations", "ops"); // client ops - osd_plb.add_u64_counter(l_osd_op_inb, "op_in_bytes", - "Client operations total write size", "wr"); // client op in bytes (writes) - osd_plb.add_u64_counter(l_osd_op_outb, "op_out_bytes", - "Client operations total read size", "rd"); // client op out bytes (reads) - osd_plb.add_time_avg(l_osd_op_lat, "op_latency", - "Latency of client operations (including queue time)", "l"); // client op latency - osd_plb.add_time_avg(l_osd_op_process_lat, "op_process_latency", - "Latency of client operations (excluding queue time)"); // client op process latency - osd_plb.add_time_avg(l_osd_op_prepare_lat, "op_prepare_latency", - "Latency of client operations (excluding queue time and wait for finished)"); // client op prepare latency - - osd_plb.add_u64_counter(l_osd_op_r, "op_r", - "Client read operations"); // client reads - osd_plb.add_u64_counter(l_osd_op_r_outb, "op_r_out_bytes", - "Client data read"); // client read out bytes - osd_plb.add_time_avg(l_osd_op_r_lat, "op_r_latency", - "Latency of read operation (including queue time)"); // client read latency - osd_plb.add_histogram(l_osd_op_r_lat_outb_hist, "op_r_latency_out_bytes_histogram", - op_hist_x_axis_config, op_hist_y_axis_config, - "Histogram of operation latency (including queue time) + data read"); - osd_plb.add_time_avg(l_osd_op_r_process_lat, "op_r_process_latency", - "Latency of read operation (excluding queue time)"); // client read process latency - osd_plb.add_time_avg(l_osd_op_r_prepare_lat, "op_r_prepare_latency", - "Latency of read operations (excluding queue time and wait for finished)"); // client read prepare latency - osd_plb.add_u64_counter(l_osd_op_w, "op_w", - "Client write operations"); // client writes - osd_plb.add_u64_counter(l_osd_op_w_inb, "op_w_in_bytes", - "Client data written"); // client write in bytes - osd_plb.add_time_avg(l_osd_op_w_lat, "op_w_latency", - "Latency of write operation (including queue time)"); // client write latency - osd_plb.add_histogram(l_osd_op_w_lat_inb_hist, "op_w_latency_in_bytes_histogram", - op_hist_x_axis_config, op_hist_y_axis_config, - "Histogram of operation latency (including queue time) + data written"); - osd_plb.add_time_avg(l_osd_op_w_process_lat, "op_w_process_latency", - "Latency of write operation (excluding queue time)"); // client write process latency - osd_plb.add_time_avg(l_osd_op_w_prepare_lat, "op_w_prepare_latency", - "Latency of write operations (excluding queue time and wait for finished)"); // client write prepare latency - osd_plb.add_u64_counter(l_osd_op_rw, "op_rw", - "Client read-modify-write operations"); // client rmw - osd_plb.add_u64_counter(l_osd_op_rw_inb, "op_rw_in_bytes", - "Client read-modify-write operations write in"); // client rmw in bytes - osd_plb.add_u64_counter(l_osd_op_rw_outb,"op_rw_out_bytes", - "Client read-modify-write operations read out "); // client rmw out bytes - osd_plb.add_time_avg(l_osd_op_rw_lat, "op_rw_latency", - "Latency of read-modify-write operation (including queue time)"); // client rmw latency - osd_plb.add_histogram(l_osd_op_rw_lat_inb_hist, "op_rw_latency_in_bytes_histogram", - op_hist_x_axis_config, op_hist_y_axis_config, - "Histogram of rw operation latency (including queue time) + data written"); - osd_plb.add_histogram(l_osd_op_rw_lat_outb_hist, "op_rw_latency_out_bytes_histogram", - op_hist_x_axis_config, op_hist_y_axis_config, - "Histogram of rw operation latency (including queue time) + data read"); - osd_plb.add_time_avg(l_osd_op_rw_process_lat, "op_rw_process_latency", - "Latency of read-modify-write operation (excluding queue time)"); // client rmw process latency - osd_plb.add_time_avg(l_osd_op_rw_prepare_lat, "op_rw_prepare_latency", - "Latency of read-modify-write operations (excluding queue time and wait for finished)"); // client rmw prepare latency - - osd_plb.add_u64_counter(l_osd_sop, "subop", "Suboperations"); // subops - osd_plb.add_u64_counter(l_osd_sop_inb, "subop_in_bytes", "Suboperations total size"); // subop in bytes - osd_plb.add_time_avg(l_osd_sop_lat, "subop_latency", "Suboperations latency"); // subop latency - - osd_plb.add_u64_counter(l_osd_sop_w, "subop_w", "Replicated writes"); // replicated (client) writes - osd_plb.add_u64_counter(l_osd_sop_w_inb, "subop_w_in_bytes", "Replicated written data size"); // replicated write in bytes - osd_plb.add_time_avg(l_osd_sop_w_lat, "subop_w_latency", "Replicated writes latency"); // replicated write latency - osd_plb.add_u64_counter(l_osd_sop_pull, "subop_pull", "Suboperations pull requests"); // pull request - osd_plb.add_time_avg(l_osd_sop_pull_lat, "subop_pull_latency", "Suboperations pull latency"); - osd_plb.add_u64_counter(l_osd_sop_push, "subop_push", "Suboperations push messages"); // push (write) - osd_plb.add_u64_counter(l_osd_sop_push_inb, "subop_push_in_bytes", "Suboperations pushed size"); - osd_plb.add_time_avg(l_osd_sop_push_lat, "subop_push_latency", "Suboperations push latency"); - - osd_plb.add_u64_counter(l_osd_pull, "pull", "Pull requests sent"); // pull requests sent - osd_plb.add_u64_counter(l_osd_push, "push", "Push messages sent"); // push messages - osd_plb.add_u64_counter(l_osd_push_outb, "push_out_bytes", "Pushed size"); // pushed bytes - - osd_plb.add_u64_counter(l_osd_rop, "recovery_ops", - "Started recovery operations", "rop"); // recovery ops (started) + osd_plb.add_u64( + l_osd_op_wip, "op_wip", + "Replication operations currently being processed (primary)"); + osd_plb.add_u64_counter( + l_osd_op, "op", + "Client operations", "ops"); + osd_plb.add_u64_counter( + l_osd_op_inb, "op_in_bytes", + "Client operations total write size", "wr"); + osd_plb.add_u64_counter( + l_osd_op_outb, "op_out_bytes", + "Client operations total read size", "rd"); + osd_plb.add_time_avg( + l_osd_op_lat, "op_latency", + "Latency of client operations (including queue time)", + "l", 9); + osd_plb.add_time_avg( + l_osd_op_process_lat, "op_process_latency", + "Latency of client operations (excluding queue time)"); + osd_plb.add_time_avg( + l_osd_op_prepare_lat, "op_prepare_latency", + "Latency of client operations (excluding queue time and wait for finished)"); + + osd_plb.add_u64_counter( + l_osd_op_r, "op_r", "Client read operations"); + osd_plb.add_u64_counter( + l_osd_op_r_outb, "op_r_out_bytes", "Client data read"); + osd_plb.add_time_avg( + l_osd_op_r_lat, "op_r_latency", + "Latency of read operation (including queue time)"); + osd_plb.add_histogram( + l_osd_op_r_lat_outb_hist, "op_r_latency_out_bytes_histogram", + op_hist_x_axis_config, op_hist_y_axis_config, + "Histogram of operation latency (including queue time) + data read"); + osd_plb.add_time_avg( + l_osd_op_r_process_lat, "op_r_process_latency", + "Latency of read operation (excluding queue time)"); + osd_plb.add_time_avg( + l_osd_op_r_prepare_lat, "op_r_prepare_latency", + "Latency of read operations (excluding queue time and wait for finished)"); + osd_plb.add_u64_counter( + l_osd_op_w, "op_w", "Client write operations"); + osd_plb.add_u64_counter( + l_osd_op_w_inb, "op_w_in_bytes", "Client data written"); + osd_plb.add_time_avg( + l_osd_op_w_lat, "op_w_latency", + "Latency of write operation (including queue time)"); + osd_plb.add_histogram( + l_osd_op_w_lat_inb_hist, "op_w_latency_in_bytes_histogram", + op_hist_x_axis_config, op_hist_y_axis_config, + "Histogram of operation latency (including queue time) + data written"); + osd_plb.add_time_avg( + l_osd_op_w_process_lat, "op_w_process_latency", + "Latency of write operation (excluding queue time)"); + osd_plb.add_time_avg( + l_osd_op_w_prepare_lat, "op_w_prepare_latency", + "Latency of write operations (excluding queue time and wait for finished)"); + osd_plb.add_u64_counter( + l_osd_op_rw, "op_rw", + "Client read-modify-write operations"); + osd_plb.add_u64_counter( + l_osd_op_rw_inb, "op_rw_in_bytes", + "Client read-modify-write operations write in"); + osd_plb.add_u64_counter( + l_osd_op_rw_outb,"op_rw_out_bytes", + "Client read-modify-write operations read out "); + osd_plb.add_time_avg( + l_osd_op_rw_lat, "op_rw_latency", + "Latency of read-modify-write operation (including queue time)"); + osd_plb.add_histogram( + l_osd_op_rw_lat_inb_hist, "op_rw_latency_in_bytes_histogram", + op_hist_x_axis_config, op_hist_y_axis_config, + "Histogram of rw operation latency (including queue time) + data written"); + osd_plb.add_histogram( + l_osd_op_rw_lat_outb_hist, "op_rw_latency_out_bytes_histogram", + op_hist_x_axis_config, op_hist_y_axis_config, + "Histogram of rw operation latency (including queue time) + data read"); + osd_plb.add_time_avg( + l_osd_op_rw_process_lat, "op_rw_process_latency", + "Latency of read-modify-write operation (excluding queue time)"); + osd_plb.add_time_avg( + l_osd_op_rw_prepare_lat, "op_rw_prepare_latency", + "Latency of read-modify-write operations (excluding queue time and wait for finished)"); + + osd_plb.add_u64_counter( + l_osd_sop, "subop", "Suboperations"); + osd_plb.add_u64_counter( + l_osd_sop_inb, "subop_in_bytes", "Suboperations total size"); + osd_plb.add_time_avg(l_osd_sop_lat, "subop_latency", "Suboperations latency"); + + osd_plb.add_u64_counter(l_osd_sop_w, "subop_w", "Replicated writes"); + osd_plb.add_u64_counter( + l_osd_sop_w_inb, "subop_w_in_bytes", "Replicated written data size"); + osd_plb.add_time_avg( + l_osd_sop_w_lat, "subop_w_latency", "Replicated writes latency"); + osd_plb.add_u64_counter( + l_osd_sop_pull, "subop_pull", "Suboperations pull requests"); + osd_plb.add_time_avg( + l_osd_sop_pull_lat, "subop_pull_latency", "Suboperations pull latency"); + osd_plb.add_u64_counter( + l_osd_sop_push, "subop_push", "Suboperations push messages"); + osd_plb.add_u64_counter( + l_osd_sop_push_inb, "subop_push_in_bytes", "Suboperations pushed size"); + osd_plb.add_time_avg( + l_osd_sop_push_lat, "subop_push_latency", "Suboperations 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 sent"); + osd_plb.add_u64_counter(l_osd_push_outb, "push_out_bytes", "Pushed size"); + + osd_plb.add_u64_counter( + l_osd_rop, "recovery_ops", + "Started recovery operations", "rop"); osd_plb.add_u64(l_osd_loadavg, "loadavg", "CPU load"); - osd_plb.add_u64(l_osd_buf, "buffer_bytes", "Total allocated buffer size"); // total ceph::buffer bytes - osd_plb.add_u64(l_osd_history_alloc_bytes, "history_alloc_Mbytes"); // total ceph::buffer bytes in history - osd_plb.add_u64(l_osd_history_alloc_num, "history_alloc_num"); // total ceph::buffer num in history - osd_plb.add_u64(l_osd_cached_crc, "cached_crc", "Total number getting crc from crc_cache"); // total ceph::buffer buffer_cached_crc - osd_plb.add_u64(l_osd_cached_crc_adjusted, "cached_crc_adjusted", "Total number getting crc from crc_cache with adjusting"); // total ceph::buffer buffer_cached_crc_adjusted - - osd_plb.add_u64(l_osd_pg, "numpg", "Placement groups"); // num pgs - osd_plb.add_u64(l_osd_pg_primary, "numpg_primary", "Placement groups for which this osd is primary"); // num primary pgs - osd_plb.add_u64(l_osd_pg_replica, "numpg_replica", "Placement groups for which this osd is replica"); // num replica pgs - osd_plb.add_u64(l_osd_pg_stray, "numpg_stray", "Placement groups ready to be deleted from this osd"); // num stray pgs - osd_plb.add_u64(l_osd_hb_to, "heartbeat_to_peers", "Heartbeat (ping) peers we send to"); // heartbeat peers we send to - osd_plb.add_u64_counter(l_osd_map, "map_messages", "OSD map messages"); // osdmap messages - osd_plb.add_u64_counter(l_osd_mape, "map_message_epochs", "OSD map epochs"); // osdmap epochs - osd_plb.add_u64_counter(l_osd_mape_dup, "map_message_epoch_dups", "OSD map duplicates"); // dup osdmap epochs - osd_plb.add_u64_counter(l_osd_waiting_for_map, "messages_delayed_for_map", "Operations waiting for OSD map"); // dup osdmap epochs - osd_plb.add_u64_counter(l_osd_map_cache_hit, "osd_map_cache_hit", "osdmap cache hit"); - osd_plb.add_u64_counter(l_osd_map_cache_miss, "osd_map_cache_miss", "osdmap cache miss"); - osd_plb.add_u64_counter(l_osd_map_cache_miss_low, "osd_map_cache_miss_low", "osdmap cache miss below cache lower bound"); - osd_plb.add_u64_avg(l_osd_map_cache_miss_low_avg, "osd_map_cache_miss_low_avg", "osdmap cache miss, avg distance below cache lower bound"); + osd_plb.add_u64(l_osd_buf, "buffer_bytes", "Total allocated buffer size"); + osd_plb.add_u64(l_osd_history_alloc_bytes, "history_alloc_Mbytes"); + osd_plb.add_u64(l_osd_history_alloc_num, "history_alloc_num"); + osd_plb.add_u64( + l_osd_cached_crc, "cached_crc", "Total number getting crc from crc_cache"); + osd_plb.add_u64( + l_osd_cached_crc_adjusted, "cached_crc_adjusted", + "Total number getting crc from crc_cache with adjusting"); + + osd_plb.add_u64(l_osd_pg, "numpg", "Placement groups", "pgs"); + osd_plb.add_u64( + l_osd_pg_primary, "numpg_primary", + "Placement groups for which this osd is primary"); + osd_plb.add_u64( + l_osd_pg_replica, "numpg_replica", + "Placement groups for which this osd is replica"); + osd_plb.add_u64( + l_osd_pg_stray, "numpg_stray", + "Placement groups ready to be deleted from this osd"); + osd_plb.add_u64( + l_osd_hb_to, "heartbeat_to_peers", "Heartbeat (ping) peers we send to"); + osd_plb.add_u64_counter(l_osd_map, "map_messages", "OSD map messages"); + osd_plb.add_u64_counter(l_osd_mape, "map_message_epochs", "OSD map epochs"); + osd_plb.add_u64_counter( + l_osd_mape_dup, "map_message_epoch_dups", "OSD map duplicates"); + osd_plb.add_u64_counter( + l_osd_waiting_for_map, "messages_delayed_for_map", + "Operations waiting for OSD map"); + osd_plb.add_u64_counter( + l_osd_map_cache_hit, "osd_map_cache_hit", "osdmap cache hit"); + osd_plb.add_u64_counter( + l_osd_map_cache_miss, "osd_map_cache_miss", "osdmap cache miss"); + osd_plb.add_u64_counter( + l_osd_map_cache_miss_low, "osd_map_cache_miss_low", + "osdmap cache miss below cache lower bound"); + osd_plb.add_u64_avg( + l_osd_map_cache_miss_low_avg, "osd_map_cache_miss_low_avg", + "osdmap cache miss, avg distance below cache lower bound"); osd_plb.add_u64(l_osd_stat_bytes, "stat_bytes", "OSD size"); osd_plb.add_u64(l_osd_stat_bytes_used, "stat_bytes_used", "Used space"); osd_plb.add_u64(l_osd_stat_bytes_avail, "stat_bytes_avail", "Available space"); - osd_plb.add_u64_counter(l_osd_copyfrom, "copyfrom", "Rados \"copy-from\" operations"); + osd_plb.add_u64_counter( + l_osd_copyfrom, "copyfrom", "Rados \"copy-from\" operations"); osd_plb.add_u64_counter(l_osd_tier_promote, "tier_promote", "Tier promotions"); osd_plb.add_u64_counter(l_osd_tier_flush, "tier_flush", "Tier flushes"); - osd_plb.add_u64_counter(l_osd_tier_flush_fail, "tier_flush_fail", "Failed tier flushes"); - osd_plb.add_u64_counter(l_osd_tier_try_flush, "tier_try_flush", "Tier flush attempts"); - osd_plb.add_u64_counter(l_osd_tier_try_flush_fail, "tier_try_flush_fail", "Failed tier flush attempts"); - osd_plb.add_u64_counter(l_osd_tier_evict, "tier_evict", "Tier evictions"); - osd_plb.add_u64_counter(l_osd_tier_whiteout, "tier_whiteout", "Tier whiteouts"); - osd_plb.add_u64_counter(l_osd_tier_dirty, "tier_dirty", "Dirty tier flag set"); - osd_plb.add_u64_counter(l_osd_tier_clean, "tier_clean", "Dirty tier flag cleaned"); - osd_plb.add_u64_counter(l_osd_tier_delay, "tier_delay", "Tier delays (agent waiting)"); - osd_plb.add_u64_counter(l_osd_tier_proxy_read, "tier_proxy_read", "Tier proxy reads"); - osd_plb.add_u64_counter(l_osd_tier_proxy_write, "tier_proxy_write", "Tier proxy writes"); - - osd_plb.add_u64_counter(l_osd_agent_wake, "agent_wake", "Tiering agent wake up"); - osd_plb.add_u64_counter(l_osd_agent_skip, "agent_skip", "Objects skipped by agent"); - osd_plb.add_u64_counter(l_osd_agent_flush, "agent_flush", "Tiering agent flushes"); - osd_plb.add_u64_counter(l_osd_agent_evict, "agent_evict", "Tiering agent evictions"); - - osd_plb.add_u64_counter(l_osd_object_ctx_cache_hit, "object_ctx_cache_hit", "Object context cache hits"); - osd_plb.add_u64_counter(l_osd_object_ctx_cache_total, "object_ctx_cache_total", "Object context cache lookups"); + osd_plb.add_u64_counter( + l_osd_tier_flush_fail, "tier_flush_fail", "Failed tier flushes"); + osd_plb.add_u64_counter( + l_osd_tier_try_flush, "tier_try_flush", "Tier flush attempts"); + osd_plb.add_u64_counter( + l_osd_tier_try_flush_fail, "tier_try_flush_fail", + "Failed tier flush attempts"); + osd_plb.add_u64_counter( + l_osd_tier_evict, "tier_evict", "Tier evictions"); + osd_plb.add_u64_counter( + l_osd_tier_whiteout, "tier_whiteout", "Tier whiteouts"); + osd_plb.add_u64_counter( + l_osd_tier_dirty, "tier_dirty", "Dirty tier flag set"); + osd_plb.add_u64_counter( + l_osd_tier_clean, "tier_clean", "Dirty tier flag cleaned"); + osd_plb.add_u64_counter( + l_osd_tier_delay, "tier_delay", "Tier delays (agent waiting)"); + osd_plb.add_u64_counter( + l_osd_tier_proxy_read, "tier_proxy_read", "Tier proxy reads"); + osd_plb.add_u64_counter( + l_osd_tier_proxy_write, "tier_proxy_write", "Tier proxy writes"); + + osd_plb.add_u64_counter( + l_osd_agent_wake, "agent_wake", "Tiering agent wake up"); + osd_plb.add_u64_counter( + l_osd_agent_skip, "agent_skip", "Objects skipped by agent"); + osd_plb.add_u64_counter( + l_osd_agent_flush, "agent_flush", "Tiering agent flushes"); + osd_plb.add_u64_counter( + l_osd_agent_evict, "agent_evict", "Tiering agent evictions"); + + osd_plb.add_u64_counter( + l_osd_object_ctx_cache_hit, "object_ctx_cache_hit", "Object context cache hits"); + osd_plb.add_u64_counter( + l_osd_object_ctx_cache_total, "object_ctx_cache_total", "Object context cache lookups"); osd_plb.add_u64_counter(l_osd_op_cache_hit, "op_cache_hit"); - osd_plb.add_time_avg(l_osd_tier_flush_lat, "osd_tier_flush_lat", "Object flush latency"); - osd_plb.add_time_avg(l_osd_tier_promote_lat, "osd_tier_promote_lat", "Object promote latency"); - osd_plb.add_time_avg(l_osd_tier_r_lat, "osd_tier_r_lat", "Object proxy read latency"); - - osd_plb.add_u64_counter(l_osd_pg_info, "osd_pg_info", - "PG updated its info (using any method)"); - osd_plb.add_u64_counter(l_osd_pg_fastinfo, "osd_pg_fastinfo", - "PG updated its info using fastinfo attr"); - osd_plb.add_u64_counter(l_osd_pg_biginfo, "osd_pg_biginfo", - "PG updated its biginfo attr"); + osd_plb.add_time_avg( + l_osd_tier_flush_lat, "osd_tier_flush_lat", "Object flush latency"); + osd_plb.add_time_avg( + l_osd_tier_promote_lat, "osd_tier_promote_lat", "Object promote latency"); + osd_plb.add_time_avg( + l_osd_tier_r_lat, "osd_tier_r_lat", "Object proxy read latency"); + + osd_plb.add_u64_counter( + l_osd_pg_info, "osd_pg_info", "PG updated its info (using any method)"); + osd_plb.add_u64_counter( + l_osd_pg_fastinfo, "osd_pg_fastinfo", + "PG updated its info using fastinfo attr"); + osd_plb.add_u64_counter( + l_osd_pg_biginfo, "osd_pg_biginfo", "PG updated its biginfo attr"); logger = osd_plb.create_perf_counters(); cct->get_perfcounters_collection()->add(logger);