From 33464cc5c7dd6c9318c171e79f655c283cc89435 Mon Sep 17 00:00:00 2001 From: Qiaowei Ren Date: Tue, 19 Jun 2018 11:12:21 +0800 Subject: [PATCH] common: fix enum redeclaration This patch fixes the error about enum redeclaration during compile time. The error is from the enum declaration in src/common/perf_counters.h: enum unit_t : uint8_t { BYTES, NONE }; When external library also includes similar declaratiron, the following error will appear: error: redeclaration of enumerator 'NONE' error: previous definition of 'NONE' ... Signed-off-by: Qiaowei Ren --- src/common/perf_counters.cc | 4 ++-- src/common/perf_counters.h | 16 ++++++++-------- src/librbd/ImageCtx.cc | 12 ++++++------ src/mon/Monitor.cc | 8 ++++---- src/mon/Paxos.cc | 10 +++++----- src/msg/async/Stack.h | 4 ++-- src/msg/async/dpdk/DPDK.cc | 8 ++++---- src/msg/async/rdma/RDMAStack.cc | 4 ++-- src/os/bluestore/BlueFS.cc | 22 +++++++++++----------- src/os/bluestore/BlueStore.cc | 14 +++++++------- src/os/filestore/WBThrottle.cc | 4 ++-- src/osd/OSD.cc | 28 ++++++++++++++-------------- src/osdc/ObjectCacher.cc | 6 +++--- src/osdc/Objecter.cc | 2 +- 14 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc index 399e66df8dd74..2bfee69e7a5ec 100644 --- a/src/common/perf_counters.cc +++ b/src/common/perf_counters.cc @@ -398,9 +398,9 @@ void PerfCounters::dump_formatted_generic(Formatter *f, bool schema, } f->dump_int("priority", get_adjusted_priority(d->prio)); - if (d->unit == NONE) { + if (d->unit == UNIT_NONE) { f->dump_string("units", "none"); - } else if (d->unit == BYTES) { + } else if (d->unit == UNIT_BYTES) { f->dump_string("units", "bytes"); } f->close_section(); diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h index 141f1a2e0b249..70a58f79b0735 100644 --- a/src/common/perf_counters.h +++ b/src/common/perf_counters.h @@ -43,8 +43,8 @@ enum perfcounter_type_d : uint8_t enum unit_t : uint8_t { - BYTES, - NONE + UNIT_BYTES, + UNIT_NONE }; /* Class for constructing a PerfCounters object. @@ -78,15 +78,15 @@ public: }; void add_u64(int key, const char *name, const char *description=NULL, const char *nick = NULL, - int prio=0, int unit=NONE); + int prio=0, int unit=UNIT_NONE); void add_u64_counter(int key, const char *name, const char *description=NULL, const char *nick = NULL, - int prio=0, int unit=NONE); + int prio=0, int unit=UNIT_NONE); void add_u64_avg(int key, const char *name, const char *description=NULL, const char *nick = NULL, - int prio=0, int unit=NONE); + int prio=0, int unit=UNIT_NONE); void add_time(int key, const char *name, const char *description=NULL, const char *nick = NULL, @@ -101,7 +101,7 @@ public: PerfHistogramCommon::axis_config_d y_axis_config, const char *description=NULL, const char* nick = NULL, - int prio=0, int unit=NONE); + int prio=0, int unit=UNIT_NONE); void set_prio_default(int prio_) { @@ -113,7 +113,7 @@ private: PerfCountersBuilder(const PerfCountersBuilder &rhs); PerfCountersBuilder& operator=(const PerfCountersBuilder &rhs); void add_impl(int idx, const char *name, - const char *description, const char *nick, int prio, int ty, int unit=NONE, + const char *description, const char *nick, int prio, int ty, int unit=UNIT_NONE, unique_ptr> histogram = nullptr); PerfCounters *m_perf_counters; @@ -156,7 +156,7 @@ public: description(NULL), nick(NULL), type(PERFCOUNTER_NONE), - unit(NONE) + unit(UNIT_NONE) {} perf_counter_data_any_d(const perf_counter_data_any_d& other) : name(other.name), diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc index 83a92ea94642e..66fbea2416f4e 100644 --- a/src/librbd/ImageCtx.cc +++ b/src/librbd/ImageCtx.cc @@ -250,24 +250,24 @@ public: plb.add_u64_counter(l_librbd_rd, "rd", "Reads", "r", perf_prio); plb.add_u64_counter(l_librbd_rd_bytes, "rd_bytes", "Data size in reads", - "rb", perf_prio, unit_t(BYTES)); + "rb", perf_prio, unit_t(UNIT_BYTES)); plb.add_time_avg(l_librbd_rd_latency, "rd_latency", "Latency of reads", "rl", perf_prio); plb.add_u64_counter(l_librbd_wr, "wr", "Writes", "w", perf_prio); plb.add_u64_counter(l_librbd_wr_bytes, "wr_bytes", "Written data", - "wb", perf_prio, unit_t(BYTES)); + "wb", perf_prio, unit_t(UNIT_BYTES)); plb.add_time_avg(l_librbd_wr_latency, "wr_latency", "Write latency", "wl", perf_prio); plb.add_u64_counter(l_librbd_discard, "discard", "Discards"); - plb.add_u64_counter(l_librbd_discard_bytes, "discard_bytes", "Discarded data", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_librbd_discard_bytes, "discard_bytes", "Discarded data", NULL, 0, unit_t(UNIT_BYTES)); plb.add_time_avg(l_librbd_discard_latency, "discard_latency", "Discard latency"); plb.add_u64_counter(l_librbd_flush, "flush", "Flushes"); plb.add_time_avg(l_librbd_flush_latency, "flush_latency", "Latency of flushes"); plb.add_u64_counter(l_librbd_ws, "ws", "WriteSames"); - plb.add_u64_counter(l_librbd_ws_bytes, "ws_bytes", "WriteSame data", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_librbd_ws_bytes, "ws_bytes", "WriteSame data", NULL, 0, unit_t(UNIT_BYTES)); plb.add_time_avg(l_librbd_ws_latency, "ws_latency", "WriteSame latency"); plb.add_u64_counter(l_librbd_cmp, "cmp", "CompareAndWrites"); - plb.add_u64_counter(l_librbd_cmp_bytes, "cmp_bytes", "Data size in cmps", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_librbd_cmp_bytes, "cmp_bytes", "Data size in cmps", NULL, 0, unit_t(UNIT_BYTES)); plb.add_time_avg(l_librbd_cmp_latency, "cmp_latency", "Latency of cmps"); plb.add_u64_counter(l_librbd_snap_create, "snap_create", "Snap creations"); plb.add_u64_counter(l_librbd_snap_remove, "snap_remove", "Snap removals"); @@ -276,7 +276,7 @@ public: plb.add_u64_counter(l_librbd_notify, "notify", "Updated header notifications"); plb.add_u64_counter(l_librbd_resize, "resize", "Resizes"); plb.add_u64_counter(l_librbd_readahead, "readahead", "Read ahead"); - plb.add_u64_counter(l_librbd_readahead_bytes, "readahead_bytes", "Data size in read ahead", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_librbd_readahead_bytes, "readahead_bytes", "Data size in read ahead", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_librbd_invalidate_cache, "invalidate_cache", "Cache invalidates"); plb.add_time(l_librbd_opened_time, "opened_time", "Opened time", diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 9e2ee8a29a7de..aab1a4611c548 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -627,9 +627,9 @@ int Monitor::preinit() pcb.add_u64(l_cluster_num_osd_up, "num_osd_up", "OSDs that are up"); pcb.add_u64(l_cluster_num_osd_in, "num_osd_in", "OSD in state \"in\" (they are in cluster)"); pcb.add_u64(l_cluster_osd_epoch, "osd_epoch", "Current epoch of OSD map"); - pcb.add_u64(l_cluster_osd_bytes, "osd_bytes", "Total capacity of cluster", NULL, 0, unit_t(BYTES)); - pcb.add_u64(l_cluster_osd_bytes_used, "osd_bytes_used", "Used space", NULL, 0, unit_t(BYTES)); - pcb.add_u64(l_cluster_osd_bytes_avail, "osd_bytes_avail", "Available space", NULL, 0, unit_t(BYTES)); + pcb.add_u64(l_cluster_osd_bytes, "osd_bytes", "Total capacity of cluster", NULL, 0, unit_t(UNIT_BYTES)); + pcb.add_u64(l_cluster_osd_bytes_used, "osd_bytes_used", "Used space", NULL, 0, unit_t(UNIT_BYTES)); + pcb.add_u64(l_cluster_osd_bytes_avail, "osd_bytes_avail", "Available space", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_u64(l_cluster_num_pool, "num_pool", "Pools"); pcb.add_u64(l_cluster_num_pg, "num_pg", "Placement groups"); pcb.add_u64(l_cluster_num_pg_active_clean, "num_pg_active_clean", "Placement groups in active+clean state"); @@ -639,7 +639,7 @@ int Monitor::preinit() pcb.add_u64(l_cluster_num_object_degraded, "num_object_degraded", "Degraded (missing replicas) objects"); pcb.add_u64(l_cluster_num_object_misplaced, "num_object_misplaced", "Misplaced (wrong location in the cluster) objects"); pcb.add_u64(l_cluster_num_object_unfound, "num_object_unfound", "Unfound objects"); - pcb.add_u64(l_cluster_num_bytes, "num_bytes", "Size of all objects", NULL, 0, unit_t(BYTES)); + pcb.add_u64(l_cluster_num_bytes, "num_bytes", "Size of all objects", NULL, 0, unit_t(UNIT_BYTES)); cluster_logger = pcb.create_perf_counters(); } diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 8003bc5ed470b..ff48eef828550 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -98,17 +98,17 @@ void Paxos::init_logger() pcb.add_time_avg(l_paxos_refresh_latency, "refresh_latency", "Refresh latency"); pcb.add_u64_counter(l_paxos_begin, "begin", "Started and handled begins"); pcb.add_u64_avg(l_paxos_begin_keys, "begin_keys", "Keys in transaction on begin"); - pcb.add_u64_avg(l_paxos_begin_bytes, "begin_bytes", "Data in transaction on begin", NULL, 0, unit_t(BYTES)); + pcb.add_u64_avg(l_paxos_begin_bytes, "begin_bytes", "Data in transaction on begin", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_time_avg(l_paxos_begin_latency, "begin_latency", "Latency of begin operation"); pcb.add_u64_counter(l_paxos_commit, "commit", "Commits", "cmt"); pcb.add_u64_avg(l_paxos_commit_keys, "commit_keys", "Keys in transaction on commit"); - pcb.add_u64_avg(l_paxos_commit_bytes, "commit_bytes", "Data in transaction on commit", NULL, 0, unit_t(BYTES)); + pcb.add_u64_avg(l_paxos_commit_bytes, "commit_bytes", "Data in transaction on commit", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_time_avg(l_paxos_commit_latency, "commit_latency", "Commit latency", "clat"); pcb.add_u64_counter(l_paxos_collect, "collect", "Peon collects"); pcb.add_u64_avg(l_paxos_collect_keys, "collect_keys", "Keys in transaction on peon collect"); - pcb.add_u64_avg(l_paxos_collect_bytes, "collect_bytes", "Data in transaction on peon collect", NULL, 0, unit_t(BYTES)); + pcb.add_u64_avg(l_paxos_collect_bytes, "collect_bytes", "Data in transaction on peon collect", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_time_avg(l_paxos_collect_latency, "collect_latency", "Peon collect latency"); pcb.add_u64_counter(l_paxos_collect_uncommitted, "collect_uncommitted", "Uncommitted values in started and handled collects"); pcb.add_u64_counter(l_paxos_collect_timeout, "collect_timeout", "Collect timeouts"); @@ -117,11 +117,11 @@ void Paxos::init_logger() pcb.add_u64_counter(l_paxos_lease_timeout, "lease_timeout", "Lease timeouts"); pcb.add_u64_counter(l_paxos_store_state, "store_state", "Store a shared state on disk"); pcb.add_u64_avg(l_paxos_store_state_keys, "store_state_keys", "Keys in transaction in stored state"); - pcb.add_u64_avg(l_paxos_store_state_bytes, "store_state_bytes", "Data in transaction in stored state", NULL, 0, unit_t(BYTES)); + pcb.add_u64_avg(l_paxos_store_state_bytes, "store_state_bytes", "Data in transaction in stored state", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_time_avg(l_paxos_store_state_latency, "store_state_latency", "Storing state latency"); pcb.add_u64_counter(l_paxos_share_state, "share_state", "Sharings of state"); pcb.add_u64_avg(l_paxos_share_state_keys, "share_state_keys", "Keys in shared state"); - pcb.add_u64_avg(l_paxos_share_state_bytes, "share_state_bytes", "Data in shared state", NULL, 0, unit_t(BYTES)); + pcb.add_u64_avg(l_paxos_share_state_bytes, "share_state_bytes", "Data in shared state", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_u64_counter(l_paxos_new_pn, "new_pn", "New proposal number queries"); pcb.add_time_avg(l_paxos_new_pn_latency, "new_pn_latency", "New proposal number getting latency"); logger = pcb.create_perf_counters(); diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h index c175f812977c0..49857a2c8394b 100644 --- a/src/msg/async/Stack.h +++ b/src/msg/async/Stack.h @@ -228,8 +228,8 @@ class Worker { plb.add_u64_counter(l_msgr_recv_messages, "msgr_recv_messages", "Network received messages"); plb.add_u64_counter(l_msgr_send_messages, "msgr_send_messages", "Network sent messages"); - plb.add_u64_counter(l_msgr_recv_bytes, "msgr_recv_bytes", "Network received bytes", NULL, 0, unit_t(BYTES)); - plb.add_u64_counter(l_msgr_send_bytes, "msgr_send_bytes", "Network sent bytes", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_msgr_recv_bytes, "msgr_recv_bytes", "Network received bytes", NULL, 0, unit_t(UNIT_BYTES)); + plb.add_u64_counter(l_msgr_send_bytes, "msgr_send_bytes", "Network sent bytes", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_msgr_active_connections, "msgr_active_connections", "Active connection number"); plb.add_u64_counter(l_msgr_created_connections, "msgr_created_connections", "Created connection number"); diff --git a/src/msg/async/dpdk/DPDK.cc b/src/msg/async/dpdk/DPDK.cc index d76101cb2f13e..f556cda890f81 100644 --- a/src/msg/async/dpdk/DPDK.cc +++ b/src/msg/async/dpdk/DPDK.cc @@ -606,16 +606,16 @@ DPDKQueuePair::DPDKQueuePair(CephContext *c, EventCenter *cen, DPDKDevice* dev, plb.add_u64_counter(l_dpdk_qp_tx_packets, "dpdk_send_packets", "DPDK sendd packets"); plb.add_u64_counter(l_dpdk_qp_rx_bad_checksum_errors, "dpdk_receive_bad_checksum_errors", "DPDK received bad checksum packets"); plb.add_u64_counter(l_dpdk_qp_rx_no_memory_errors, "dpdk_receive_no_memory_errors", "DPDK received no memory packets"); - plb.add_u64_counter(l_dpdk_qp_rx_bytes, "dpdk_receive_bytes", "DPDK received bytes", NULL, 0, unit_t(BYTES)); - plb.add_u64_counter(l_dpdk_qp_tx_bytes, "dpdk_send_bytes", "DPDK sendd bytes", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_dpdk_qp_rx_bytes, "dpdk_receive_bytes", "DPDK received bytes", NULL, 0, unit_t(UNIT_BYTES)); + plb.add_u64_counter(l_dpdk_qp_tx_bytes, "dpdk_send_bytes", "DPDK sendd bytes", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_dpdk_qp_rx_last_bunch, "dpdk_receive_last_bunch", "DPDK last received bunch"); plb.add_u64_counter(l_dpdk_qp_tx_last_bunch, "dpdk_send_last_bunch", "DPDK last send bunch"); plb.add_u64_counter(l_dpdk_qp_rx_fragments, "dpdk_receive_fragments", "DPDK received total fragments"); plb.add_u64_counter(l_dpdk_qp_tx_fragments, "dpdk_send_fragments", "DPDK sendd total fragments"); plb.add_u64_counter(l_dpdk_qp_rx_copy_ops, "dpdk_receive_copy_ops", "DPDK received copy operations"); plb.add_u64_counter(l_dpdk_qp_tx_copy_ops, "dpdk_send_copy_ops", "DPDK sendd copy operations"); - plb.add_u64_counter(l_dpdk_qp_rx_copy_bytes, "dpdk_receive_copy_bytes", "DPDK received copy bytes", NULL, 0, unit_t(BYTES)); - plb.add_u64_counter(l_dpdk_qp_tx_copy_bytes, "dpdk_send_copy_bytes", "DPDK send copy bytes", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_dpdk_qp_rx_copy_bytes, "dpdk_receive_copy_bytes", "DPDK received copy bytes", NULL, 0, unit_t(UNIT_BYTES)); + plb.add_u64_counter(l_dpdk_qp_tx_copy_bytes, "dpdk_send_copy_bytes", "DPDK send copy bytes", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_dpdk_qp_rx_linearize_ops, "dpdk_receive_linearize_ops", "DPDK received linearize operations"); plb.add_u64_counter(l_dpdk_qp_tx_linearize_ops, "dpdk_send_linearize_ops", "DPDK send linearize operations"); plb.add_u64_counter(l_dpdk_qp_tx_queue_length, "dpdk_send_queue_length", "DPDK send queue length"); diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc index 0790cdb12eed3..9fea9c742f9c0 100644 --- a/src/msg/async/rdma/RDMAStack.cc +++ b/src/msg/async/rdma/RDMAStack.cc @@ -467,9 +467,9 @@ RDMAWorker::RDMAWorker(CephContext *c, unsigned i) plb.add_u64_counter(l_msgr_rdma_tx_failed, "tx_failed_post", "The number of tx failed posted"); plb.add_u64_counter(l_msgr_rdma_tx_chunks, "tx_chunks", "The number of tx chunks transmitted"); - plb.add_u64_counter(l_msgr_rdma_tx_bytes, "tx_bytes", "The bytes of tx chunks transmitted", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_msgr_rdma_tx_bytes, "tx_bytes", "The bytes of tx chunks transmitted", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_msgr_rdma_rx_chunks, "rx_chunks", "The number of rx chunks transmitted"); - plb.add_u64_counter(l_msgr_rdma_rx_bytes, "rx_bytes", "The bytes of rx chunks transmitted", NULL, 0, unit_t(BYTES)); + plb.add_u64_counter(l_msgr_rdma_rx_bytes, "rx_bytes", "The bytes of rx chunks transmitted", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_msgr_rdma_pending_sent_conns, "pending_sent_conns", "The count of pending sent conns"); perf_logger = plb.create_perf_counters(); diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 97b55d2b8bd27..13af495349591 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -75,36 +75,36 @@ void BlueFS::_init_logger() PerfCountersBuilder b(cct, "bluefs", l_bluefs_first, l_bluefs_last); b.add_u64_counter(l_bluefs_gift_bytes, "gift_bytes", - "Bytes gifted from BlueStore", NULL, 0, unit_t(BYTES)); + "Bytes gifted from BlueStore", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluefs_reclaim_bytes, "reclaim_bytes", - "Bytes reclaimed by BlueStore", NULL, 0, unit_t(BYTES)); + "Bytes reclaimed by BlueStore", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_db_total_bytes, "db_total_bytes", "Total bytes (main db device)", - "b", PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "b", PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_db_used_bytes, "db_used_bytes", "Used bytes (main db device)", - "u", PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "u", PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_wal_total_bytes, "wal_total_bytes", "Total bytes (wal device)", - "walb", PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "walb", PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_wal_used_bytes, "wal_used_bytes", "Used bytes (wal device)", - "walu", PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "walu", PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_slow_total_bytes, "slow_total_bytes", "Total bytes (slow device)", - "slob", PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "slob", PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_slow_used_bytes, "slow_used_bytes", "Used bytes (slow device)", - "slou", PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "slou", PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); b.add_u64(l_bluefs_num_files, "num_files", "File count", "f", PerfCountersBuilder::PRIO_USEFUL); b.add_u64(l_bluefs_log_bytes, "log_bytes", "Size of the metadata log", - "jlen", PerfCountersBuilder::PRIO_INTERESTING, unit_t(BYTES)); + "jlen", PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluefs_log_compactions, "log_compactions", "Compactions of the metadata log"); b.add_u64_counter(l_bluefs_logged_bytes, "logged_bytes", "Bytes written to the metadata log", "j", - PerfCountersBuilder::PRIO_CRITICAL, unit_t(BYTES)); + PerfCountersBuilder::PRIO_CRITICAL, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluefs_files_written_wal, "files_written_wal", "Files written to WAL"); b.add_u64_counter(l_bluefs_files_written_sst, "files_written_sst", @@ -114,7 +114,7 @@ void BlueFS::_init_logger() PerfCountersBuilder::PRIO_CRITICAL); b.add_u64_counter(l_bluefs_bytes_written_sst, "bytes_written_sst", "Bytes written to SSTs", "sst", - PerfCountersBuilder::PRIO_CRITICAL, unit_t(BYTES)); + PerfCountersBuilder::PRIO_CRITICAL, unit_t(UNIT_BYTES)); logger = b.create_perf_counters(); cct->get_perfcounters_collection()->add(logger); } diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index e4aec0eed7365..036591195b0a4 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -4120,11 +4120,11 @@ void BlueStore::_init_logger() b.add_u64_counter(l_bluestore_compress_rejected_count, "compress_rejected_count", "Sum for compress ops rejected due to low net gain of space"); b.add_u64_counter(l_bluestore_write_pad_bytes, "write_pad_bytes", - "Sum for write-op padded bytes", NULL, 0, unit_t(BYTES)); + "Sum for write-op padded bytes", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluestore_deferred_write_ops, "deferred_write_ops", "Sum for deferred write op"); b.add_u64_counter(l_bluestore_deferred_write_bytes, "deferred_write_bytes", - "Sum for deferred write bytes", "def", 0, unit_t(BYTES)); + "Sum for deferred write bytes", "def", 0, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluestore_write_penalty_read_ops, "write_penalty_read_ops", "Sum for write penalty read ops"); b.add_u64(l_bluestore_allocated, "bluestore_allocated", @@ -4156,22 +4156,22 @@ void BlueStore::_init_logger() b.add_u64(l_bluestore_buffers, "bluestore_buffers", "Number of buffers in cache"); b.add_u64(l_bluestore_buffer_bytes, "bluestore_buffer_bytes", - "Number of buffer bytes in cache", NULL, 0, unit_t(BYTES)); + "Number of buffer bytes in cache", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64(l_bluestore_buffer_hit_bytes, "bluestore_buffer_hit_bytes", - "Sum for bytes of read hit in the cache", NULL, 0, unit_t(BYTES)); + "Sum for bytes of read hit in the cache", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64(l_bluestore_buffer_miss_bytes, "bluestore_buffer_miss_bytes", - "Sum for bytes of read missed in the cache", NULL, 0, unit_t(BYTES)); + "Sum for bytes of read missed in the cache", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluestore_write_big, "bluestore_write_big", "Large aligned writes into fresh blobs"); b.add_u64_counter(l_bluestore_write_big_bytes, "bluestore_write_big_bytes", - "Large aligned writes into fresh blobs (bytes)", NULL, 0, unit_t(BYTES)); + "Large aligned writes into fresh blobs (bytes)", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluestore_write_big_blobs, "bluestore_write_big_blobs", "Large aligned writes into fresh blobs (blobs)"); b.add_u64_counter(l_bluestore_write_small, "bluestore_write_small", "Small writes into existing or sparse small blobs"); b.add_u64_counter(l_bluestore_write_small_bytes, "bluestore_write_small_bytes", - "Small writes into existing or sparse small blobs (bytes)", NULL, 0, unit_t(BYTES)); + "Small writes into existing or sparse small blobs (bytes)", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64_counter(l_bluestore_write_small_unused, "bluestore_write_small_unused", "Small writes into unused portion of existing blob"); diff --git a/src/os/filestore/WBThrottle.cc b/src/os/filestore/WBThrottle.cc index 963a40059e35c..daf7959b18764 100644 --- a/src/os/filestore/WBThrottle.cc +++ b/src/os/filestore/WBThrottle.cc @@ -22,8 +22,8 @@ WBThrottle::WBThrottle(CephContext *cct) : PerfCountersBuilder b( cct, string("WBThrottle"), l_wbthrottle_first, l_wbthrottle_last); - b.add_u64(l_wbthrottle_bytes_dirtied, "bytes_dirtied", "Dirty data", NULL, 0, unit_t(BYTES)); - b.add_u64(l_wbthrottle_bytes_wb, "bytes_wb", "Written data", NULL, 0, unit_t(BYTES)); + b.add_u64(l_wbthrottle_bytes_dirtied, "bytes_dirtied", "Dirty data", NULL, 0, unit_t(UNIT_BYTES)); + b.add_u64(l_wbthrottle_bytes_wb, "bytes_wb", "Written data", NULL, 0, unit_t(UNIT_BYTES)); b.add_u64(l_wbthrottle_ios_dirtied, "ios_dirtied", "Dirty operations"); b.add_u64(l_wbthrottle_ios_wb, "ios_wb", "Written operations"); b.add_u64(l_wbthrottle_inodes_dirtied, "inodes_dirtied", "Entries waiting for write"); diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 591a1b6090252..c63ded7de789a 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2955,11 +2955,11 @@ void OSD::create_logger() osd_plb.add_u64_counter( l_osd_op_inb, "op_in_bytes", "Client operations total write size", - "wr", PerfCountersBuilder::PRIO_INTERESTING, unit_t(BYTES)); + "wr", PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); osd_plb.add_u64_counter( l_osd_op_outb, "op_out_bytes", "Client operations total read size", - "rd", PerfCountersBuilder::PRIO_INTERESTING, unit_t(BYTES)); + "rd", PerfCountersBuilder::PRIO_INTERESTING, unit_t(UNIT_BYTES)); osd_plb.add_time_avg( l_osd_op_lat, "op_latency", "Latency of client operations (including queue time)", @@ -2974,7 +2974,7 @@ void OSD::create_logger() 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", NULL, PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + l_osd_op_r_outb, "op_r_out_bytes", "Client data read", NULL, PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); osd_plb.add_time_avg( l_osd_op_r_lat, "op_r_latency", "Latency of read operation (including queue time)"); @@ -3010,10 +3010,10 @@ void OSD::create_logger() "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", NULL, PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "Client read-modify-write operations write in", NULL, PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); osd_plb.add_u64_counter( l_osd_op_rw_outb,"op_rw_out_bytes", - "Client read-modify-write operations read out ", NULL, PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + "Client read-modify-write operations read out ", NULL, PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); osd_plb.add_time_avg( l_osd_op_rw_lat, "op_rw_latency", "Latency of read-modify-write operation (including queue time)"); @@ -3044,12 +3044,12 @@ void OSD::create_logger() 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", NULL, 0, unit_t(BYTES)); + l_osd_sop_inb, "subop_in_bytes", "Suboperations total size", NULL, 0, unit_t(UNIT_BYTES)); 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", NULL, 0, unit_t(BYTES)); + l_osd_sop_w_inb, "subop_w_in_bytes", "Replicated written data size", NULL, 0, unit_t(UNIT_BYTES)); osd_plb.add_time_avg( l_osd_sop_w_lat, "subop_w_latency", "Replicated writes latency"); osd_plb.add_u64_counter( @@ -3059,13 +3059,13 @@ void OSD::create_logger() 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", NULL, 0, unit_t(BYTES)); + l_osd_sop_push_inb, "subop_push_in_bytes", "Suboperations pushed size", NULL, 0, unit_t(UNIT_BYTES)); 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", NULL, 0, unit_t(BYTES)); + osd_plb.add_u64_counter(l_osd_push_outb, "push_out_bytes", "Pushed size", NULL, 0, unit_t(UNIT_BYTES)); osd_plb.add_u64_counter( l_osd_rop, "recovery_ops", @@ -3073,8 +3073,8 @@ void OSD::create_logger() "rop", PerfCountersBuilder::PRIO_INTERESTING); osd_plb.add_u64(l_osd_loadavg, "loadavg", "CPU load"); - osd_plb.add_u64(l_osd_buf, "buffer_bytes", "Total allocated buffer size", NULL, 0, unit_t(BYTES)); - osd_plb.add_u64(l_osd_history_alloc_bytes, "history_alloc_Mbytes", NULL, 0, unit_t(BYTES)); + osd_plb.add_u64(l_osd_buf, "buffer_bytes", "Total allocated buffer size", NULL, 0, unit_t(UNIT_BYTES)); + osd_plb.add_u64(l_osd_history_alloc_bytes, "history_alloc_Mbytes", NULL, 0, unit_t(UNIT_BYTES)); 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"); @@ -3128,11 +3128,11 @@ void OSD::create_logger() osd_plb.add_u64( l_osd_stat_bytes, "stat_bytes", "OSD size", "size", - PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); osd_plb.add_u64( l_osd_stat_bytes_used, "stat_bytes_used", "Used space", "used", - PerfCountersBuilder::PRIO_USEFUL, unit_t(BYTES)); - osd_plb.add_u64(l_osd_stat_bytes_avail, "stat_bytes_avail", "Available space", NULL, 0, unit_t(BYTES)); + PerfCountersBuilder::PRIO_USEFUL, unit_t(UNIT_BYTES)); + osd_plb.add_u64(l_osd_stat_bytes_avail, "stat_bytes_avail", "Available space", NULL, 0, unit_t(UNIT_BYTES)); osd_plb.add_u64_counter( l_osd_copyfrom, "copyfrom", "Rados \"copy-from\" operations"); diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 4b658408ab2cf..90a8db3e6ddbc 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -680,9 +680,9 @@ void ObjectCacher::perf_start() plb.add_u64_counter(l_objectcacher_cache_ops_miss, "cache_ops_miss", "Miss operations"); plb.add_u64_counter(l_objectcacher_cache_bytes_hit, - "cache_bytes_hit", "Hit data", NULL, 0, unit_t(BYTES)); + "cache_bytes_hit", "Hit data", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_objectcacher_cache_bytes_miss, - "cache_bytes_miss", "Miss data", NULL, 0, unit_t(BYTES)); + "cache_bytes_miss", "Miss data", NULL, 0, unit_t(UNIT_BYTES)); plb.add_u64_counter(l_objectcacher_data_read, "data_read", "Read data"); plb.add_u64_counter(l_objectcacher_data_written, @@ -696,7 +696,7 @@ void ObjectCacher::perf_start() "Write operations, delayed due to dirty limits"); plb.add_u64_counter(l_objectcacher_write_bytes_blocked, "write_bytes_blocked", - "Write data blocked on dirty limit", NULL, 0, unit_t(BYTES)); + "Write data blocked on dirty limit", NULL, 0, unit_t(UNIT_BYTES)); plb.add_time(l_objectcacher_write_time_blocked, "write_time_blocked", "Time spent blocking a write due to dirty limits"); diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index cd6479f5abf6d..b57d0a5a3dcce 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -246,7 +246,7 @@ void Objecter::init() PerfCountersBuilder::PRIO_CRITICAL); pcb.add_u64(l_osdc_op_laggy, "op_laggy", "Laggy operations"); pcb.add_u64_counter(l_osdc_op_send, "op_send", "Sent operations"); - pcb.add_u64_counter(l_osdc_op_send_bytes, "op_send_bytes", "Sent data", NULL, 0, unit_t(BYTES)); + pcb.add_u64_counter(l_osdc_op_send_bytes, "op_send_bytes", "Sent data", NULL, 0, unit_t(UNIT_BYTES)); pcb.add_u64_counter(l_osdc_op_resend, "op_resend", "Resent operations"); pcb.add_u64_counter(l_osdc_op_reply, "op_reply", "Operation reply"); -- 2.39.5