From d6ce8740949001c72d203d7a29a1077201114b5d Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 8 Jan 2016 17:34:40 +0800 Subject: [PATCH] Objecter: fix typo and wrong tracing messages Signed-off-by: xie xingguo --- src/osdc/Objecter.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 906176d9b22f..45c6351afdb2 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -2282,13 +2282,13 @@ ceph_tid_t Objecter::_op_submit(Op *op, RWLock::Context& lc) if ((op->target.flags & CEPH_OSD_FLAG_WRITE) && osdmap->test_flag(CEPH_OSDMAP_PAUSEWR)) { - ldout(cct, 10) << " paused modify " << op << " tid " << last_tid.read() + ldout(cct, 10) << " paused modify " << op << " tid " << op->tid << dendl; op->target.paused = true; _maybe_request_map(); } else if ((op->target.flags & CEPH_OSD_FLAG_READ) && osdmap->test_flag(CEPH_OSDMAP_PAUSERD)) { - ldout(cct, 10) << " paused read " << op << " tid " << last_tid.read() + ldout(cct, 10) << " paused read " << op << " tid " << op->tid << dendl; op->target.paused = true; _maybe_request_map(); @@ -2298,7 +2298,7 @@ ceph_tid_t Objecter::_op_submit(Op *op, RWLock::Context& lc) (_osdmap_full_flag() || _osdmap_pool_full(op->target.base_oloc.pool))) { ldout(cct, 0) << " FULL, paused modify " << op << " tid " - << last_tid.read() << dendl; + << op->tid << dendl; op->target.paused = true; _maybe_request_map(); } else if (!s->is_homeless()) { @@ -4223,7 +4223,6 @@ bool Objecter::ms_handle_reset(Connection *con) if (!initialized.read()) return false; if (con->get_peer_type() == CEPH_ENTITY_TYPE_OSD) { - // int osd = osdmap->identify_osd(con->get_peer_addr()); if (osd >= 0) { ldout(cct, 1) << "ms_handle_reset on osd." << osd << dendl; @@ -4485,7 +4484,7 @@ void Objecter::dump_pool_stat_ops(Formatter *fmt) const ++it) { fmt->dump_string("pool", *it); } - fmt->close_section(); // pool_op object + fmt->close_section(); // pools array fmt->close_section(); // pool_stat_op object } @@ -4502,9 +4501,9 @@ void Objecter::dump_statfs_ops(Formatter *fmt) const fmt->open_object_section("statfs_op"); fmt->dump_unsigned("tid", op->tid); fmt->dump_stream("last_sent") << op->last_submit; - fmt->close_section(); // pool_stat_op object + fmt->close_section(); // statfs_op object } - fmt->close_section(); // pool_stat_ops array + fmt->close_section(); // statfs_ops array } Objecter::RequestStateHook::RequestStateHook(Objecter *objecter) : -- 2.47.3