diff options
author | Greg Farnum <greg@inktank.com> | 2013-09-03 14:41:18 -0700 |
---|---|---|
committer | Greg Farnum <greg@inktank.com> | 2013-09-10 15:33:48 -0700 |
commit | 79f02d6b8f57b6c33996aae452b7d6ddec04e97a (patch) | |
tree | 23bcbc2fbc70b8e9d5c0745fbb06fe5ed57e2b08 | |
parent | aeec0c6476986e23b8647d92be689869f2df8d33 (diff) | |
download | ceph-79f02d6b8f57b6c33996aae452b7d6ddec04e97a.tar.gz |
Objecter: rename Op::oid -> Op::base_oid
Analagous to the oloc->base_oloc rename we did in
e2fcad09d94d965867147627b73e99da9454436f, we may specify a different
target name for a redirect. Rename the existing oid to base_oid to
avoid any confusion.
Signed-off-by: Greg Farnum <greg@inktank.com>
-rw-r--r-- | src/osdc/Objecter.cc | 12 | ||||
-rw-r--r-- | src/osdc/Objecter.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 188c28d5e56..de4132d5319 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1243,7 +1243,7 @@ tid_t Objecter::_op_submit(Op *op) } // send? - ldout(cct, 10) << "op_submit oid " << op->oid + ldout(cct, 10) << "op_submit oid " << op->base_oid << " " << op->base_oloc << " " << op->target_oloc << " " << op->ops << " tid " << op->tid << " osd." << (op->session ? op->session->osd : -1) @@ -1338,12 +1338,12 @@ int Objecter::recalc_op_target(Op *op) } if (op->precalc_pgid) { - assert(op->oid.name.empty()); // make sure this is a listing op + assert(op->base_oid.name.empty()); // make sure this is a listing op ldout(cct, 10) << "recalc_op_target have " << pgid << " pool " << osdmap->have_pg_pool(pgid.pool()) << dendl; if (!osdmap->have_pg_pool(pgid.pool())) return RECALC_OP_TARGET_POOL_DNE; } else { - int ret = osdmap->object_locator_to_pg(op->oid, op->target_oloc, pgid); + int ret = osdmap->object_locator_to_pg(op->base_oid, op->target_oloc, pgid); if (ret == -ENOENT) return RECALC_OP_TARGET_POOL_DNE; } @@ -1485,7 +1485,7 @@ void Objecter::send_op(Op *op) op->stamp = ceph_clock_now(cct); MOSDOp *m = new MOSDOp(client_inc, op->tid, - op->oid, op->target_oloc, op->pgid, osdmap->get_epoch(), + op->base_oid, op->target_oloc, op->pgid, osdmap->get_epoch(), flags); m->set_snapid(op->snapid); @@ -2219,7 +2219,7 @@ void Objecter::dump_active() for (map<tid_t,Op*>::iterator p = ops.begin(); p != ops.end(); ++p) { Op *op = p->second; ldout(cct, 20) << op->tid << "\t" << op->pgid << "\tosd." << (op->session ? op->session->osd : -1) - << "\t" << op->oid << "\t" << op->ops << dendl; + << "\t" << op->base_oid << "\t" << op->ops << dendl; } } @@ -2250,7 +2250,7 @@ void Objecter::dump_ops(Formatter *fmt) const fmt->dump_int("osd", op->session ? op->session->osd : -1); fmt->dump_stream("last_sent") << op->stamp; fmt->dump_int("attempts", op->attempts); - fmt->dump_stream("object_id") << op->oid; + fmt->dump_stream("object_id") << op->base_oid; fmt->dump_stream("object_locator") << op->base_oloc; fmt->dump_stream("target_object_locator") << op->target_oloc; fmt->dump_stream("snapid") << op->snapid; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 154ee410fde..9c9341ac4d2 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -828,7 +828,7 @@ public: xlist<Op*>::item session_item; int incarnation; - object_t oid; + object_t base_oid; object_locator_t base_oloc; object_locator_t target_oloc; @@ -874,7 +874,7 @@ public: Op(const object_t& o, const object_locator_t& ol, vector<OSDOp>& op, int f, Context *ac, Context *co, version_t *ov) : session(NULL), session_item(this), incarnation(0), - oid(o), base_oloc(ol), + base_oid(o), base_oloc(ol), used_replica(false), con(NULL), snapid(CEPH_NOSNAP), outbl(NULL), |