diff options
author | David Zafman <david.zafman@inktank.com> | 2013-04-29 14:36:18 -0700 |
---|---|---|
committer | David Zafman <david.zafman@inktank.com> | 2013-04-29 17:46:15 -0700 |
commit | b5e246106d299af817451ecab780754c31e2d4ca (patch) | |
tree | 41a7510e7872a3513dc7ec744cccc09d7bd6c894 | |
parent | 95ece0125138a8c8cb6af8a9627305db083d7114 (diff) | |
download | ceph-b5e246106d299af817451ecab780754c31e2d4ca.tar.gz |
osd: Rename members and methods related to stat publish
pg_stats_lock to pg_stats_publish_lock
pg_stats_valid to pg_stats_publish_valid
pg_stats_stable to pg_stats_publish
update_stats() to publish_stats_to_osd()
clear_stats() to clear_publish_stats()
Signed-off-by: David Zafman <david.zafman@inktank.com>
-rw-r--r-- | src/osd/OSD.cc | 26 | ||||
-rw-r--r-- | src/osd/PG.cc | 70 | ||||
-rw-r--r-- | src/osd/PG.h | 12 | ||||
-rw-r--r-- | src/osd/ReplicatedPG.cc | 10 |
4 files changed, 59 insertions, 59 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 85edf66f3b4..aa662b59b1a 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3014,14 +3014,14 @@ void OSD::send_pg_stats(const utime_t &now) pg->put("pg_stat_queue"); continue; } - pg->pg_stats_lock.Lock(); - if (pg->pg_stats_valid) { - m->pg_stat[pg->info.pgid] = pg->pg_stats_stable; - dout(25) << " sending " << pg->info.pgid << " " << pg->pg_stats_stable.reported << dendl; + pg->pg_stats_publish_lock.Lock(); + if (pg->pg_stats_publish_valid) { + m->pg_stat[pg->info.pgid] = pg->pg_stats_publish; + dout(25) << " sending " << pg->info.pgid << " " << pg->pg_stats_publish.reported << dendl; } else { - dout(25) << " NOT sending " << pg->info.pgid << " " << pg->pg_stats_stable.reported << ", not valid" << dendl; + dout(25) << " NOT sending " << pg->info.pgid << " " << pg->pg_stats_publish.reported << ", not valid" << dendl; } - pg->pg_stats_lock.Unlock(); + pg->pg_stats_publish_lock.Unlock(); } if (!outstanding_pg_stats) { @@ -3060,18 +3060,18 @@ void OSD::handle_pg_stats_ack(MPGStatsAck *ack) if (ack->pg_stat.count(pg->info.pgid)) { eversion_t acked = ack->pg_stat[pg->info.pgid]; - pg->pg_stats_lock.Lock(); - if (acked == pg->pg_stats_stable.reported) { - dout(25) << " ack on " << pg->info.pgid << " " << pg->pg_stats_stable.reported << dendl; + pg->pg_stats_publish_lock.Lock(); + if (acked == pg->pg_stats_publish.reported) { + dout(25) << " ack on " << pg->info.pgid << " " << pg->pg_stats_publish.reported << dendl; pg->stat_queue_item.remove_myself(); pg->put("pg_stat_queue"); } else { - dout(25) << " still pending " << pg->info.pgid << " " << pg->pg_stats_stable.reported + dout(25) << " still pending " << pg->info.pgid << " " << pg->pg_stats_publish.reported << " > acked " << acked << dendl; } - pg->pg_stats_lock.Unlock(); + pg->pg_stats_publish_lock.Unlock(); } else { - dout(30) << " still pending " << pg->info.pgid << " " << pg->pg_stats_stable.reported << dendl; + dout(30) << " still pending " << pg->info.pgid << " " << pg->pg_stats_publish.reported << dendl; } } @@ -5153,7 +5153,7 @@ void OSD::handle_pg_create(OpRequestRef op) wake_pg_waiters(pg->info.pgid); pg->handle_create(&rctx); pg->write_if_dirty(*rctx.transaction); - pg->update_stats(); + pg->publish_stats_to_osd(); pg->unlock(); num_created++; } diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 70584e44591..3ddbe93d51d 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -163,8 +163,8 @@ PG::PG(OSDService *o, OSDMapRef curmap, backfill_reserved(0), backfill_reserving(0), flushed(false), - pg_stats_lock("PG::pg_stats_lock"), - pg_stats_valid(false), + pg_stats_publish_lock("PG::pg_stats_publish_lock"), + pg_stats_publish_valid(false), osr(osd->osr_registry.lookup_or_create(p, (stringify(p)))), finish_sync_event(NULL), scrub_after_recovery(false), @@ -790,7 +790,7 @@ bool PG::search_for_missing(const pg_info_t &oinfo, const pg_missing_t *omissing found_missing = true; } if (stats_updated) { - update_stats(); + publish_stats_to_osd(); } dout(20) << "search_for_missing missing " << missing.missing << dendl; @@ -1705,7 +1705,7 @@ void PG::activate(ObjectStore::Transaction& t, AllReplicasRecovered()))); } - update_stats(); + publish_stats_to_osd(); } // we need to flush this all out before doing anything else.. @@ -1848,7 +1848,7 @@ void PG::replay_queued_ops() requeue_ops(replay); requeue_ops(waiting_for_active); - update_stats(); + publish_stats_to_osd(); } void PG::_activate_committed(epoch_t e) @@ -1899,7 +1899,7 @@ void PG::all_activated_and_committed() info.history.last_epoch_started = info.last_epoch_started; share_pg_info(); - update_stats(); + publish_stats_to_osd(); queue_peering_event( CephPeeringEvtRef( @@ -1991,7 +1991,7 @@ void PG::_finish_recovery(Context *c) finish_sync_event = 0; purge_strays(); - update_stats(); + publish_stats_to_osd(); if (scrub_after_recovery) { dout(10) << "_finish_recovery requeueing for scrub" << dendl; @@ -2299,9 +2299,9 @@ void PG::update_heartbeat_peers() osd->need_heartbeat_peer_update(); } -void PG::update_stats() +void PG::publish_stats_to_osd() { - pg_stats_lock.Lock(); + pg_stats_publish_lock.Lock(); if (is_primary()) { // update our stat summary info.stats.reported.inc(info.history.same_primary_since); @@ -2339,17 +2339,17 @@ void PG::update_stats() info.stats.log_start = log.tail; info.stats.ondisk_log_start = log.tail; - pg_stats_valid = true; - pg_stats_stable = info.stats; + pg_stats_publish_valid = true; + pg_stats_publish = info.stats; // calc copies, degraded unsigned target = MAX(get_osdmap()->get_pg_size(info.pgid), acting.size()); - pg_stats_stable.stats.calc_copies(target); - pg_stats_stable.stats.sum.num_objects_degraded = 0; + pg_stats_publish.stats.calc_copies(target); + pg_stats_publish.stats.sum.num_objects_degraded = 0; if ((is_degraded() || !is_clean()) && is_active()) { // NOTE: we only generate copies, degraded, unfound values for // the summation, not individual stat categories. - uint64_t num_objects = pg_stats_stable.stats.sum.num_objects; + uint64_t num_objects = pg_stats_publish.stats.sum.num_objects; uint64_t degraded = 0; @@ -2358,7 +2358,7 @@ void PG::update_stats() degraded += (target - acting.size()) * num_objects; // missing on primary - pg_stats_stable.stats.sum.num_objects_missing_on_primary = missing.num_missing(); + pg_stats_publish.stats.sum.num_objects_missing_on_primary = missing.num_missing(); degraded += missing.num_missing(); for (unsigned i=1; i<acting.size(); i++) { @@ -2370,27 +2370,27 @@ void PG::update_stats() // not yet backfilled degraded += num_objects - peer_info[acting[i]].stats.stats.sum.num_objects; } - pg_stats_stable.stats.sum.num_objects_degraded = degraded; - pg_stats_stable.stats.sum.num_objects_unfound = get_num_unfound(); + pg_stats_publish.stats.sum.num_objects_degraded = degraded; + pg_stats_publish.stats.sum.num_objects_unfound = get_num_unfound(); } - dout(15) << "update_stats " << pg_stats_stable.reported << dendl; + dout(15) << "publish_stats_to_osd " << pg_stats_publish.reported << dendl; } else { - pg_stats_valid = false; - dout(15) << "update_stats -- not primary" << dendl; + pg_stats_publish_valid = false; + dout(15) << "publish_stats_to_osd -- not primary" << dendl; } - pg_stats_lock.Unlock(); + pg_stats_publish_lock.Unlock(); if (is_primary()) osd->pg_stat_queue_enqueue(this); } -void PG::clear_stats() +void PG::clear_publish_stats() { dout(15) << "clear_stats" << dendl; - pg_stats_lock.Lock(); - pg_stats_valid = false; - pg_stats_lock.Unlock(); + pg_stats_publish_lock.Lock(); + pg_stats_publish_valid = false; + pg_stats_publish_lock.Unlock(); osd->pg_stat_queue_dequeue(this); } @@ -3817,7 +3817,7 @@ void PG::scrub() state_clear(PG_STATE_SCRUBBING); state_clear(PG_STATE_REPAIR); state_clear(PG_STATE_DEEP_SCRUB); - update_stats(); + publish_stats_to_osd(); unlock(); return; } @@ -3903,7 +3903,7 @@ void PG::classic_scrub() scrubber.active = true; scrubber.classic = true; - update_stats(); + publish_stats_to_osd(); scrubber.received_maps.clear(); scrubber.epoch_start = info.history.same_interval_since; @@ -4078,7 +4078,7 @@ void PG::chunky_scrub() { case PG::Scrubber::INACTIVE: dout(10) << "scrub start" << dendl; - update_stats(); + publish_stats_to_osd(); scrubber.epoch_start = info.history.same_interval_since; scrubber.active = true; @@ -4256,7 +4256,7 @@ void PG::scrub_clear_state() state_clear(PG_STATE_SCRUBBING); state_clear(PG_STATE_REPAIR); state_clear(PG_STATE_DEEP_SCRUB); - update_stats(); + publish_stats_to_osd(); // active -> nothing. if (scrubber.active) @@ -5093,7 +5093,7 @@ void PG::start_peering_interval(const OSDMapRef lastmap, // old primary? if (oldrole == 0) { state_clear(PG_STATE_CLEAN); - clear_stats(); + clear_publish_stats(); // take replay queue waiters list<OpRequestRef> ls; @@ -6048,7 +6048,7 @@ boost::statechart::result PG::RecoveryState::Primary::react(const ActMap&) { dout(7) << "handle ActMap primary" << dendl; PG *pg = context< RecoveryMachine >().pg; - pg->update_stats(); + pg->publish_stats_to_osd(); pg->take_waiters(); return discard_event(); } @@ -6568,7 +6568,7 @@ PG::RecoveryState::Clean::Clean(my_context ctx) pg->mark_clean(); pg->share_pg_info(); - pg->update_stats(); + pg->publish_stats_to_osd(); } @@ -6636,7 +6636,7 @@ boost::statechart::result PG::RecoveryState::Active::react(const AdvMap& advmap) pg->state_clear(PG_STATE_DEGRADED); else pg->state_set(PG_STATE_DEGRADED); - pg->update_stats(); // degraded may have changed + pg->publish_stats_to_osd(); // degraded may have changed } return forward_event(); } @@ -7015,7 +7015,7 @@ PG::RecoveryState::GetInfo::GetInfo(my_context ctx) if (!prior_set.get()) pg->build_prior(prior_set); - pg->update_stats(); + pg->publish_stats_to_osd(); get_infos(); if (peer_info_requested.empty() && !prior_set->pg_down) { @@ -7348,7 +7348,7 @@ PG::RecoveryState::Incomplete::Incomplete(my_context ctx) pg->state_clear(PG_STATE_PEERING); pg->state_set(PG_STATE_INCOMPLETE); - pg->update_stats(); + pg->publish_stats_to_osd(); } boost::statechart::result PG::RecoveryState::Incomplete::react(const AdvMap &advmap) { diff --git a/src/osd/PG.h b/src/osd/PG.h index bdd276d0bc7..f74814db869 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -716,16 +716,16 @@ protected: void requeue_object_waiters(map<hobject_t, list<OpRequestRef> >& m); void requeue_ops(list<OpRequestRef> &l); - // stats - Mutex pg_stats_lock; - bool pg_stats_valid; - pg_stat_t pg_stats_stable; + // publish stats + Mutex pg_stats_publish_lock; + bool pg_stats_publish_valid; + pg_stat_t pg_stats_publish; // for ordering writes std::tr1::shared_ptr<ObjectStore::Sequencer> osr; - void update_stats(); - void clear_stats(); + void publish_stats_to_osd(); + void clear_publish_stats(); public: void clear_primary_state(); diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index fb24375dca6..83b4db491b7 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1039,7 +1039,7 @@ void ReplicatedPG::do_op(OpRequestRef op) if (ctx->op_t.empty() || result < 0) { if (result >= 0) { log_op_stats(ctx); - update_stats(); + publish_stats_to_osd(); } MOSDOpReply *reply = ctx->reply; @@ -3879,7 +3879,7 @@ void ReplicatedPG::eval_repop(RepGather *repop) if (repop->waitfor_disk.empty()) { log_op_stats(repop->ctx); - update_stats(); + publish_stats_to_osd(); // send dup commits, in order if (waiting_for_ondisk.count(repop->v)) { @@ -5454,7 +5454,7 @@ void ReplicatedPG::handle_pull_response(OpRequestRef op) if (complete) { pulling.erase(hoid); pull_from_peer[m->get_source().num()].erase(hoid); - update_stats(); + publish_stats_to_osd(); if (waiting_for_missing_object.count(hoid)) { dout(20) << " kicking waiters on " << hoid << dendl; requeue_ops(waiting_for_missing_object[hoid]); @@ -5701,7 +5701,7 @@ void ReplicatedPG::sub_op_push_reply(OpRequestRef op) pushing[soid].erase(peer); pi = NULL; - update_stats(); + publish_stats_to_osd(); if (pushing[soid].empty()) { pushing.erase(soid); @@ -7277,7 +7277,7 @@ void ReplicatedPG::_scrub_finish() if (repair) { ++scrubber.fixed; info.stats.stats = scrub_cstat; - update_stats(); + publish_stats_to_osd(); share_pg_info(); } } |