From e4b310943397e3251f1effc9c72492ebe48bc399 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Sat, 15 Mar 2014 00:21:44 +0100 Subject: [PATCH] KeyValueStore: rename s/logger/perf_logger/ [src/os/KeyValueStore.h:368] -> [src/os/ObjectStore.h:100]: (warning) The class 'KeyValueStore' defines member variable with name 'logger' also defined in its parent class 'ObjectStore'. KeyValueStore logger is of type PerfCounters while ObjectStore logger is Logger. Change the name in KeyValueStore to more obvious name perf_logger. Signed-off-by: Danny Al-Gaaf --- src/os/KeyValueStore.cc | 32 ++++++++++++++++---------------- src/os/KeyValueStore.h | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc index cc117fa3a6718..02d6f607fe14f 100644 --- a/src/os/KeyValueStore.cc +++ b/src/os/KeyValueStore.cc @@ -505,7 +505,7 @@ KeyValueStore::KeyValueStore(const std::string &base, g_conf->keyvaluestore_op_threads, "keyvaluestore_op_threads"), op_wq(this, g_conf->keyvaluestore_op_thread_timeout, g_conf->keyvaluestore_op_thread_suicide_timeout, &op_tp), - logger(NULL), + perf_logger(NULL), m_keyvaluestore_queue_max_ops(g_conf->keyvaluestore_queue_max_ops), m_keyvaluestore_queue_max_bytes(g_conf->keyvaluestore_queue_max_bytes), do_update(do_update) @@ -518,7 +518,7 @@ KeyValueStore::KeyValueStore(const std::string &base, sss << basedir << "/current/commit_op_seq"; current_op_seq_fn = sss.str(); - // initialize logger + // initialize perf_logger PerfCountersBuilder plb(g_ceph_context, internal_name, l_os_commit_lat, l_os_last); plb.add_u64(l_os_oq_max_ops, "op_queue_max_ops"); @@ -530,18 +530,18 @@ KeyValueStore::KeyValueStore(const std::string &base, plb.add_time_avg(l_os_apply_lat, "apply_latency"); plb.add_time_avg(l_os_queue_lat, "queue_transaction_latency_avg"); - logger = plb.create_perf_counters(); + perf_logger = plb.create_perf_counters(); - g_ceph_context->get_perfcounters_collection()->add(logger); + g_ceph_context->get_perfcounters_collection()->add(perf_logger); g_ceph_context->_conf->add_observer(this); } KeyValueStore::~KeyValueStore() { g_ceph_context->_conf->remove_observer(this); - g_ceph_context->get_perfcounters_collection()->remove(logger); + g_ceph_context->get_perfcounters_collection()->remove(perf_logger); - delete logger; + delete perf_logger; } int KeyValueStore::statfs(struct statfs *buf) @@ -1006,8 +1006,8 @@ void KeyValueStore::queue_op(OpSequencer *osr, Op *o) osr->queue(o); - logger->inc(l_os_ops); - logger->inc(l_os_bytes, o->bytes); + perf_logger->inc(l_os_ops); + perf_logger->inc(l_os_bytes, o->bytes); dout(5) << "queue_op " << o << " seq " << o->op << " " << *osr << " " << o->bytes << " bytes" << " (queue has " << op_queue_len @@ -1020,8 +1020,8 @@ void KeyValueStore::op_queue_reserve_throttle(Op *o, ThreadPool::TPHandle *handl uint64_t max_ops = m_keyvaluestore_queue_max_ops; uint64_t max_bytes = m_keyvaluestore_queue_max_bytes; - logger->set(l_os_oq_max_ops, max_ops); - logger->set(l_os_oq_max_bytes, max_bytes); + perf_logger->set(l_os_oq_max_ops, max_ops); + perf_logger->set(l_os_oq_max_bytes, max_bytes); utime_t start = ceph_clock_now(g_ceph_context); { @@ -1043,10 +1043,10 @@ void KeyValueStore::op_queue_reserve_throttle(Op *o, ThreadPool::TPHandle *handl op_queue_bytes += o->bytes; } utime_t end = ceph_clock_now(g_ceph_context); - logger->tinc(l_os_queue_lat, end - start); + perf_logger->tinc(l_os_queue_lat, end - start); - logger->set(l_os_oq_ops, op_queue_len); - logger->set(l_os_oq_bytes, op_queue_bytes); + perf_logger->set(l_os_oq_ops, op_queue_len); + perf_logger->set(l_os_oq_bytes, op_queue_bytes); } void KeyValueStore::op_queue_release_throttle(Op *o) @@ -1058,8 +1058,8 @@ void KeyValueStore::op_queue_release_throttle(Op *o) op_throttle_cond.Signal(); } - logger->set(l_os_oq_ops, op_queue_len); - logger->set(l_os_oq_bytes, op_queue_bytes); + perf_logger->set(l_os_oq_ops, op_queue_len); + perf_logger->set(l_os_oq_bytes, op_queue_bytes); } void KeyValueStore::_do_op(OpSequencer *osr, ThreadPool::TPHandle &handle) @@ -1093,7 +1093,7 @@ void KeyValueStore::_finish_op(OpSequencer *osr) utime_t lat = ceph_clock_now(g_ceph_context); lat -= o->start; - logger->tinc(l_os_apply_lat, lat); + perf_logger->tinc(l_os_apply_lat, lat); if (o->onreadable_sync) { o->onreadable_sync->complete(0); diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h index d7b9c0a11644a..8dfd395c0deb8 100644 --- a/src/os/KeyValueStore.h +++ b/src/os/KeyValueStore.h @@ -365,7 +365,7 @@ class KeyValueStore : public ObjectStore, void op_queue_release_throttle(Op *o); void _finish_op(OpSequencer *osr); - PerfCounters *logger; + PerfCounters *perf_logger; public: -- 2.39.5