Objecter: rename Op::oloc -> Op::base_oloc

We want to be able to target other pools for caching and tiering, so
we need to take an oloc from the client and translate it into an
actual target. Rename oloc to base_oloc to make clear which one it is.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 9fb0bfa446d92f258e152c272552343c784c98ba..24ddc04ba625b808c61927af17f2e5e48fa993f9 100644 (file)
--- 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
-           << " " << op->oloc 
+           << " " << op->base_oloc 
           << " " << op->ops << " tid " << op->tid
            << " osd." << (op->session ? op->session->osd : -1)
            << dendl;
@@ -1302,7 +1302,7 @@ int Objecter::recalc_op_target(Op *op)
     if (!osdmap->have_pg_pool(pgid.pool()))
       return RECALC_OP_TARGET_POOL_DNE;
   } else {
-    int ret = osdmap->object_locator_to_pg(op->oid, op->oloc, pgid);
+    int ret = osdmap->object_locator_to_pg(op->oid, op->base_oloc, pgid);
     if (ret == -ENOENT)
       return RECALC_OP_TARGET_POOL_DNE;
   }
@@ -1444,7 +1444,7 @@ void Objecter::send_op(Op *op)
   op->stamp = ceph_clock_now(cct);
 
   MOSDOp *m = new MOSDOp(client_inc, op->tid, 
-                        op->oid, op->oloc, op->pgid, osdmap->get_epoch(),
+                        op->oid, op->base_oloc, op->pgid, osdmap->get_epoch(),
                         flags);
 
   m->set_snapid(op->snapid);
@@ -2210,7 +2210,7 @@ void Objecter::dump_ops(Formatter *fmt) const
     fmt->dump_stream("last_sent") << op->stamp;
     fmt->dump_int("attempts", op->attempts);
     fmt->dump_stream("object_id") << op->oid;
-    fmt->dump_stream("object_locator") << op->oloc;
+    fmt->dump_stream("object_locator") << op->base_oloc;
     fmt->dump_stream("snapid") << op->snapid;
     fmt->dump_stream("snap_context") << op->snapc;
     fmt->dump_stream("mtime") << op->mtime;

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 7041ab984f7296786c855a361f04429172191bc3..d38487dcda8d7a30dcd293b88ac79c68f55d7ab8 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -745,7 +745,7 @@ public:
     int incarnation;
     
     object_t oid;
-    object_locator_t oloc;
+    object_locator_t base_oloc;
 
     pg_t pgid;
     vector<int> acting;
@@ -789,7 +789,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), oloc(ol),
+      oid(o), base_oloc(ol),
       used_replica(false), con(NULL),
       snapid(CEPH_NOSNAP),
       outbl(NULL),
@@ -811,8 +811,8 @@ public:
        out_rval[i] = NULL;
       }
 
-      if (oloc.key == o)
-       oloc.key.clear();
+      if (base_oloc.key == o)
+       base_oloc.key.clear();
     }
     ~Op() {
       while (!out_handler.empty()) {