osd: remove inc_lock

diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 7f8e8e36268940339ad50009ba4362bd55a4d85f..93305b4e1f6b54ec67c0e10aa44f705948011f45 100644 (file)
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -41,7 +41,6 @@ public:
   // subop metadata
   tid_t rep_tid;
   eversion_t version;
-  uint32_t inc_lock;
 
   bool old_exists;
   __u64 old_size;
@@ -70,7 +69,6 @@ public:
     ::decode(acks_wanted, p);
     ::decode(rep_tid, p);
     ::decode(version, p);
-    ::decode(inc_lock, p);
     ::decode(old_exists, p);
     ::decode(old_size, p);
     ::decode(old_version, p);
@@ -93,7 +91,6 @@ public:
     ::encode(acks_wanted, payload);
     ::encode(rep_tid, payload);
     ::encode(version, payload);
-    ::encode(inc_lock, payload);
     ::encode(old_exists, payload);
     ::encode(old_size, payload);
     ::encode(old_version, payload);
@@ -112,7 +109,7 @@ public:
 
 
   MOSDSubOp(osd_reqid_t r, pg_t p, pobject_t po, vector<ceph_osd_op>& o, bool noop_, int aw,
-           epoch_t mape, tid_t rtid, unsigned il, eversion_t v) :
+           epoch_t mape, tid_t rtid, eversion_t v) :
     Message(MSG_OSD_SUBOP),
     map_epoch(mape),
     reqid(r),
@@ -122,7 +119,6 @@ public:
     ops(o), noop(noop_),   
     rep_tid(rtid),
     version(v),
-    inc_lock(il),
     old_exists(false), old_size(0)
   {
     memset(&peer_stat, 0, sizeof(peer_stat));

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f856722fe14af6e20ebcdb07309ddfb214c371bd..71762bfd71c7ac492b98fc151dda76c4c62e4be9 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2050,7 +2050,7 @@ void PG::scrub()
     eversion_t v;
     osd_reqid_t reqid;
     MOSDSubOp *subop = new MOSDSubOp(reqid, info.pgid, poid, scrub, false, 0,
-                                    osd->osdmap->get_epoch(), osd->get_tid(), 0, v);
+                                    osd->osdmap->get_epoch(), osd->get_tid(), v);
     osd->messenger->send_message(subop, //new MOSDPGScrub(info.pgid, osd->osdmap->get_epoch()),
                                 osd->osdmap->get_inst(acting[i]));
   }

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index fcf46178a1d415a69926bbf988ddb39447039645..a5480f0aabf657bd52c2bebec34072130dc176cd 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -716,22 +716,6 @@ void ReplicatedPG::op_read(MOSDOp *op)
       goto done;    // we have no revision for this request.
   } 
   
-  // check inc_lock?
-  if (op->get_inc_lock() > 0) {
-    bufferlist b;
-    __u32 cur = 0;
-    osd->store->getattr(info.pgid.to_coll(), poid, "inc_lock", b);
-    if (b.length()) {
-      ::decode(cur, b);
-      if (cur > op->get_inc_lock()) {
-       dout(10) << " inc_lock " << cur << " > " << op->get_inc_lock()
-                << " on " << poid << dendl;
-       result = -EINCLOCKED;
-       goto done;
-      }
-    }
-  }
-
   for (vector<ceph_osd_op>::iterator p = op->ops.begin(); p != op->ops.end(); p++) {
     switch (p->op) {
     case CEPH_OSD_OP_READ:
@@ -1145,7 +1129,7 @@ void ReplicatedPG::prepare_transaction(ObjectStore::Transaction& t, osd_reqid_t
                                       vector<ceph_osd_op>& ops, bufferlist& bl,
                                       bool& exists, __u64& size, object_info_t& oi,
                                       eversion_t at_version, SnapContext& snapc,
-                                      __u32 inc_lock, eversion_t trim_to)
+                                      eversion_t trim_to)
 {
   bufferlist log_bl;
   eversion_t log_version = at_version;
@@ -1172,12 +1156,6 @@ void ReplicatedPG::prepare_transaction(ObjectStore::Transaction& t, osd_reqid_t
   // finish.
   oi.version = at_version;
   if (exists) {
-    if (inc_lock) {
-      bufferlist b(sizeof(inc_lock));
-      ::encode(inc_lock, b);
-      t.setattr(info.pgid.to_coll(), poid, "inc_lock", b);
-    }
-
     oi.version = at_version;
     oi.prior_version = old_version;
     oi.last_reqid = reqid;
@@ -1389,7 +1367,7 @@ void ReplicatedPG::issue_repop(RepGather *repop, int dest, utime_t now)
   MOSDSubOp *wr = new MOSDSubOp(repop->op->get_reqid(), info.pgid, poid,
                                repop->op->ops, repop->noop, acks_wanted,
                                osd->osdmap->get_epoch(), 
-                               repop->rep_tid, repop->op->get_inc_lock(), repop->at_version);
+                               repop->rep_tid, repop->at_version);
   wr->old_exists = repop->pinfo->exists;
   wr->old_size = repop->pinfo->size;
   wr->old_version = repop->pinfo->oi.version;
@@ -1535,22 +1513,6 @@ void ReplicatedPG::op_modify(MOSDOp *op)
       block_if_wrlocked(op)) 
     return; // op will be handled later, after the object unlocks
   
-  // check inc_lock?
-  if (op->get_inc_lock() > 0) {
-    bufferlist b;
-    osd->store->getattr(info.pgid.to_coll(), poid, "inc_lock", b);
-    if (b.length()) {
-      __u32 cur = 0;
-      ::decode(cur, b);
-      if (cur > op->get_inc_lock()) {
-       dout(10) << " inc_lock " << cur << " > " << op->get_inc_lock()
-                << " on " << poid << dendl;
-       osd->reply_op_error(op, -EINCLOCKED);
-       return;
-      }
-    }
-  }
-
   // balance-reads set?
 #if 0
   char v;
@@ -1670,7 +1632,7 @@ void ReplicatedPG::op_modify(MOSDOp *op)
     prepare_transaction(repop->t, op->get_reqid(), poid, op->ops, op->get_data(),
                        pinfo->exists, pinfo->size, pinfo->oi,
                        at_version, snapc,
-                       op->get_inc_lock(), trim_to);
+                       trim_to);
   }
   
   // keep peer_info up to date
@@ -1787,7 +1749,7 @@ void ReplicatedPG::sub_op_modify(MOSDSubOp *op)
     prepare_transaction(t, op->reqid,
                        op->poid, op->ops, op->get_data(),
                        op->old_exists, op->old_size, oi, op->version,
-                       op->snapc, op->inc_lock, op->pg_trim_to);
+                       op->snapc, op->pg_trim_to);
   }
   
   C_OSD_RepModifyCommit *oncommit = new C_OSD_RepModifyCommit(this, op, ackerosd, info.last_complete);
@@ -2028,7 +1990,7 @@ bool ReplicatedPG::pull(pobject_t poid)
   vector<ceph_osd_op> pull(1);
   pull[0].op = CEPH_OSD_OP_PULL;
   MOSDSubOp *subop = new MOSDSubOp(rid, info.pgid, poid, pull, false, CEPH_OSD_OP_ACK,
-                                  osd->osdmap->get_epoch(), tid, 0, v);
+                                  osd->osdmap->get_epoch(), tid, v);
   subop->data_subset.swap(data_subset);
   // do not include clone_subsets in pull request; we will recalculate this
   // when the object is pushed back.
@@ -2168,7 +2130,7 @@ void ReplicatedPG::push(pobject_t poid, int peer,
   push[0].offset = 0;
   push[0].length = size;
   MOSDSubOp *subop = new MOSDSubOp(rid, info.pgid, poid, push, false, 0,
-                                  osd->osdmap->get_epoch(), osd->get_tid(), 0, oi.version);
+                                  osd->osdmap->get_epoch(), osd->get_tid(), oi.version);
   subop->data_subset.swap(data_subset);
   subop->clone_subsets.swap(clone_subsets);
   subop->set_data(bl);   // note: claims bl, set length above here!

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 8b46bdb41e713a3d4d602968b562818e9f4de714..865db920717e2a1a4c534248f1ea24fa49f2c3c4 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -192,7 +192,7 @@ protected:
                           vector<ceph_osd_op>& ops, bufferlist& bl,
                           bool& exists, __u64& size, object_info_t& oi,
                           eversion_t at_version, SnapContext& snapc,
-                          __u32 inc_lock, eversion_t trim_to);
+                          eversion_t trim_to);
   
   friend class C_OSD_ModifyCommit;
   friend class C_OSD_RepModifyCommit;