Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osd: fix typos and some cleanups #19211

Merged
merged 3 commits into from
Dec 15, 2017
Merged

osd: fix typos and some cleanups #19211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef12911
osd: fix comment typos
ZVampirEM77 Nov 28, 2017
1013988
osd: PrimaryLogPG cleanup unnecessary function called
ZVampirEM77 Nov 28, 2017
b103b49
osd: PrimaryLogPG use __func__ instead of function name for dout
ZVampirEM77 Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/osd/OSD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6552,7 +6552,7 @@ void OSD::ms_fast_dispatch(Message *m)
if (m->trace)
op->osd_trace.init("osd op", &trace_endpoint, &m->trace);

// note sender epoch, min req'd epoch
// note sender epoch, min req's epoch
op->sent_epoch = static_cast<MOSDFastDispatchOp*>(m)->get_map_epoch();
op->min_epoch = static_cast<MOSDFastDispatchOp*>(m)->get_min_epoch();
assert(op->min_epoch <= op->sent_epoch); // sanity check!
Expand Down
83 changes: 41 additions & 42 deletions src/osd/PrimaryLogPG.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,13 +1651,14 @@ void PrimaryLogPG::do_request(

// pg-wide backoffs
const Message *m = op->get_req();
int msg_type = m->get_type();
if (m->get_connection()->has_feature(CEPH_FEATURE_RADOS_BACKOFF)) {
SessionRef session = static_cast<Session*>(m->get_connection()->get_priv());
if (!session)
return; // drop it.
session->put(); // get_priv takes a ref, and so does the SessionRef

if (op->get_req()->get_type() == CEPH_MSG_OSD_OP) {
if (msg_type == CEPH_MSG_OSD_OP) {
if (session->check_backoff(cct, info.pgid,
info.pgid.pgid.get_hobj_start(), m)) {
return;
Expand All @@ -1678,7 +1679,7 @@ void PrimaryLogPG::do_request(
}
}
// pg backoff acks at pg-level
if (op->get_req()->get_type() == CEPH_MSG_OSD_BACKOFF) {
if (msg_type == CEPH_MSG_OSD_BACKOFF) {
const MOSDBackoff *ba = static_cast<const MOSDBackoff*>(m);
if (ba->begin != ba->end) {
handle_backoff(op);
Expand Down Expand Up @@ -1713,7 +1714,7 @@ void PrimaryLogPG::do_request(
if (pgbackend->handle_message(op))
return;

switch (op->get_req()->get_type()) {
switch (msg_type) {
case CEPH_MSG_OSD_OP:
case CEPH_MSG_OSD_BACKOFF:
if (!is_active()) {
Expand All @@ -1722,7 +1723,7 @@ void PrimaryLogPG::do_request(
op->mark_delayed("waiting for active");
return;
}
switch (op->get_req()->get_type()) {
switch (msg_type) {
case CEPH_MSG_OSD_OP:
// verify client features
if ((pool.info.has_tiers() || pool.info.is_tier()) &&
Expand Down Expand Up @@ -9798,7 +9799,7 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
*pmissing = oid;
return -ENOENT;
}
dout(10) << "find_object_context " << oid
dout(10) << __func__ << " " << oid
<< " @" << oid.snap
<< " oi=" << obc->obs.oi
<< dendl;
Expand Down Expand Up @@ -9826,13 +9827,13 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
}

if (map_snapid_to_clone) {
dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " map_snapid_to_clone=true" << dendl;
if (oid.snap > ssc->snapset.seq) {
// already must be readable
ObjectContextRef obc = get_object_context(head, false);
dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " maps to head" << dendl;
*pobc = obc;
Expand All @@ -9844,19 +9845,19 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
ssc->snapset.clones.end(),
oid.snap);
if (citer == ssc->snapset.clones.end()) {
dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " maps to nothing" << dendl;
put_snapset_context(ssc);
return -ENOENT;
}

dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " maps to " << oid << dendl;

if (pg_log.get_missing().is_missing(oid)) {
dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " " << oid << " is missing" << dendl;
if (pmissing)
Expand All @@ -9867,15 +9868,15 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,

ObjectContextRef obc = get_object_context(oid, false);
if (!obc || !obc->obs.exists) {
dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " " << oid << " is not present" << dendl;
if (pmissing)
*pmissing = oid;
put_snapset_context(ssc);
return -ENOENT;
}
dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset
<< " " << oid << " HIT" << dendl;
*pobc = obc;
Expand All @@ -9885,13 +9886,13 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
ceph_abort(); //unreachable
}

dout(10) << "find_object_context " << oid << " @" << oid.snap
dout(10) << __func__ << " " << oid << " @" << oid.snap
<< " snapset " << ssc->snapset << dendl;

// head?
if (oid.snap > ssc->snapset.seq) {
ObjectContextRef obc = get_object_context(head, false);
dout(10) << "find_object_context " << head
dout(10) << __func__ << " " << head
<< " want " << oid.snap << " > snapset seq " << ssc->snapset.seq
<< " -- HIT " << obc->obs
<< dendl;
Expand All @@ -9911,7 +9912,7 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
ssc->snapset.clones[k] < oid.snap)
k++;
if (k == ssc->snapset.clones.size()) {
dout(10) << "find_object_context no clones with last >= oid.snap "
dout(10) << __func__ << " no clones with last >= oid.snap "
<< oid.snap << " -- DNE" << dendl;
put_snapset_context(ssc);
return -ENOENT;
Expand All @@ -9920,7 +9921,7 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
info.pgid.pool(), oid.get_namespace());

if (pg_log.get_missing().is_missing(soid)) {
dout(20) << "find_object_context " << soid << " missing, try again later"
dout(20) << __func__ << " " << soid << " missing, try again later"
<< dendl;
if (pmissing)
*pmissing = soid;
Expand Down Expand Up @@ -9951,7 +9952,7 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
ssc = 0;

// clone
dout(20) << "find_object_context " << soid
dout(20) << __func__ << " " << soid
<< " snapset " << obc->ssc->snapset
<< dendl;
snapid_t first, last;
Expand All @@ -9960,12 +9961,12 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
first = p->second.back();
last = p->second.front();
if (first <= oid.snap) {
dout(20) << "find_object_context " << soid << " [" << first << "," << last
dout(20) << __func__ << " " << soid << " [" << first << "," << last
<< "] contains " << oid.snap << " -- HIT " << obc->obs << dendl;
*pobc = obc;
return 0;
} else {
dout(20) << "find_object_context " << soid << " [" << first << "," << last
dout(20) << __func__ << " " << soid << " [" << first << "," << last
<< "] does not contain " << oid.snap << " -- DNE" << dendl;
return -ENOENT;
}
Expand All @@ -9981,7 +9982,7 @@ void PrimaryLogPG::add_object_context_to_pg_stat(ObjectContextRef obc, pg_stat_t
{
object_info_t& oi = obc->obs.oi;

dout(10) << "add_object_context_to_pg_stat " << oi.soid << dendl;
dout(10) << __func__ << " " << oi.soid << dendl;
assert(!oi.soid.is_snapdir());

object_stat_sum_t stat;
Expand Down Expand Up @@ -10100,14 +10101,11 @@ void PrimaryLogPG::put_snapset_context(SnapSetContext *ssc)
}
}

/** pull - request object from a peer
*/

/*
* Return values:
* NONE - didn't pull anything
* YES - pulled what the caller wanted
* OTHER - needed to pull head first
* HEAD - needed to pull head first
*/
enum { PULL_NONE, PULL_HEAD, PULL_YES };

Expand All @@ -10117,7 +10115,7 @@ int PrimaryLogPG::recover_missing(
PGBackend::RecoveryHandle *h)
{
if (missing_loc.is_unfound(soid)) {
dout(7) << "pull " << soid
dout(7) << __func__ << " " << soid
<< " v " << v
<< " but it is unfound" << dendl;
return PULL_NONE;
Expand Down Expand Up @@ -10231,7 +10229,7 @@ void PrimaryLogPG::remove_missing_object(const hobject_t &soid,

void PrimaryLogPG::finish_degraded_object(const hobject_t& oid)
{
dout(10) << "finish_degraded_object " << oid << dendl;
dout(10) << __func__ << " " << oid << dendl;
if (callbacks_for_degraded_object.count(oid)) {
list<Context*> contexts;
contexts.swap(callbacks_for_degraded_object[oid]);
Expand All @@ -10254,7 +10252,7 @@ void PrimaryLogPG::_committed_pushed_object(
{
lock();
if (!pg_has_reset_since(epoch)) {
dout(10) << "_committed_pushed_object last_complete " << last_complete << " now ondisk" << dendl;
dout(10) << __func__ << " last_complete " << last_complete << " now ondisk" << dendl;
last_complete_ondisk = last_complete;

if (last_complete_ondisk == info.last_update) {
Expand All @@ -10274,7 +10272,7 @@ void PrimaryLogPG::_committed_pushed_object(
}

} else {
dout(10) << "_committed_pushed_object pg has changed, not touching last_complete_ondisk" << dendl;
dout(10) << __func__ << " pg has changed, not touching last_complete_ondisk" << dendl;
}

unlock();
Expand Down Expand Up @@ -10700,7 +10698,7 @@ void PrimaryLogPG::on_flushed()
if (!is_peered() || !is_primary()) {
pair<hobject_t, ObjectContextRef> i;
while (object_contexts.get_next(i.first, &i)) {
derr << "on_flushed: object " << i.first << " obc still alive" << dendl;
derr << __func__ << ": object " << i.first << " obc still alive" << dendl;
}
assert(object_contexts.empty());
}
Expand All @@ -10709,7 +10707,7 @@ void PrimaryLogPG::on_flushed()

void PrimaryLogPG::on_removal(ObjectStore::Transaction *t)
{
dout(10) << "on_removal" << dendl;
dout(10) << __func__ << dendl;

// adjust info to backfill
info.set_last_backfill(hobject_t());
Expand Down Expand Up @@ -10826,7 +10824,7 @@ void PrimaryLogPG::on_activate()
last_backfill_started = earliest_backfill();
new_backfill = true;
assert(!last_backfill_started.is_max());
dout(5) << "on activate: bft=" << backfill_targets
dout(5) << __func__ << ": bft=" << backfill_targets
<< " from " << last_backfill_started << dendl;
for (set<pg_shard_t>::iterator i = backfill_targets.begin();
i != backfill_targets.end();
Expand All @@ -10853,7 +10851,7 @@ void PrimaryLogPG::_on_new_interval()

void PrimaryLogPG::on_change(ObjectStore::Transaction *t)
{
dout(10) << "on_change" << dendl;
dout(10) << __func__ << dendl;

if (hit_set && hit_set->insert_count() == 0) {
dout(20) << " discarding empty hit_set" << dendl;
Expand Down Expand Up @@ -10961,7 +10959,7 @@ void PrimaryLogPG::on_change(ObjectStore::Transaction *t)

void PrimaryLogPG::on_role_change()
{
dout(10) << "on_role_change" << dendl;
dout(10) << __func__ << dendl;
if (get_role() != 0 && hit_set) {
dout(10) << " clearing hit set" << dendl;
hit_set_clear();
Expand Down Expand Up @@ -11086,15 +11084,15 @@ void PG::MissingLoc::check_recovery_sources(const OSDMapRef& osdmap)
++p;
continue;
}
ldout(pg->cct, 10) << "check_recovery_sources source osd." << *p << " now down" << dendl;
ldout(pg->cct, 10) << __func__ << " source osd." << *p << " now down" << dendl;
now_down.insert(*p);
missing_loc_sources.erase(p++);
}

if (now_down.empty()) {
ldout(pg->cct, 10) << "check_recovery_sources no source osds (" << missing_loc_sources << ") went down" << dendl;
ldout(pg->cct, 10) << __func__ << " no source osds (" << missing_loc_sources << ") went down" << dendl;
} else {
ldout(pg->cct, 10) << "check_recovery_sources sources osds " << now_down << " now down, remaining sources are "
ldout(pg->cct, 10) << __func__ << " sources osds " << now_down << " now down, remaining sources are "
<< missing_loc_sources << dendl;

// filter missing_loc
Expand Down Expand Up @@ -11285,10 +11283,11 @@ uint64_t PrimaryLogPG::recover_primary(uint64_t max, ThreadPool::TPHandle &handl

const auto &missing = pg_log.get_missing();

dout(10) << "recover_primary recovering " << recovering.size()
<< " in pg" << dendl;
dout(10) << "recover_primary " << missing << dendl;
dout(25) << "recover_primary " << missing.get_items() << dendl;
dout(10) << __func__ << " recovering " << recovering.size()
<< " in pg,"
<< " missing " << missing << dendl;

dout(25) << __func__ << " " << missing.get_items() << dendl;

// look at log!
pg_log_entry_t *latest = 0;
Expand Down Expand Up @@ -11318,7 +11317,7 @@ uint64_t PrimaryLogPG::recover_primary(uint64_t max, ThreadPool::TPHandle &handl

eversion_t need = item.need;

dout(10) << "recover_primary "
dout(10) << __func__ << " "
<< soid << " " << item.need
<< (missing.is_missing(soid) ? " (missing)":"")
<< (missing.is_missing(head) ? " (missing head)":"")
Expand Down Expand Up @@ -11693,7 +11692,7 @@ uint64_t PrimaryLogPG::recover_backfill(
uint64_t max,
ThreadPool::TPHandle &handle, bool *work_started)
{
dout(10) << "recover_backfill (" << max << ")"
dout(10) << __func__ << " (" << max << ")"
<< " bft=" << backfill_targets
<< " last_backfill_started " << last_backfill_started
<< (new_backfill ? " new_backfill":"")
Expand Down