PG: remove the object locking stubs and some dead code.

These are unused (#if 0'd, so no way to use them!) and require
a memory-hogging hash_map. Goodbye!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 93a8248aeaa0ca19c6a1cd2c82b4e1d90873902a..1e919794c43409c589d26ef902a0017d86943a85 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2706,28 +2706,6 @@ void PG::adjust_local_snaps(ObjectStore::Transaction &t, interval_set<snapid_t>
 }
 
 
-// ==============================
-// Object locking
-
-//
-// If the target object of the operation op is locked for writing by another client, the function puts op to the waiting queue waiting_for_wr_unlock
-// returns true if object was locked, otherwise returns false
-// 
-bool PG::block_if_wrlocked(MOSDOp* op, object_info_t& oi)
-{
-  sobject_t soid(op->get_oid(), CEPH_NOSNAP);
-
-  if (oi.wrlock_by.tid &&
-      oi.wrlock_by.name != op->get_orig_source()) {
-    //the object is locked for writing by someone else -- add the op to the waiting queue      
-    dout(10) << "blocked on wrlock on " << oi << dendl;
-    waiting_for_wr_unlock[soid].push_back(op);
-    return true;
-  }
-  
-  return false; //the object wasn't locked, so the operation can be handled right away
-}
-
 void PG::take_object_waiters(map<sobject_t, list<Message*> >& m)
 {
   for (map<sobject_t, list<Message*> >::iterator it = m.begin();

diff --git a/src/osd/PG.h b/src/osd/PG.h
index b57011ca82ac8450f06ab779929d55280bec07b4..37910bd0e0667b639aab2ce744254ef6ff5fe916 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -774,8 +774,6 @@ public:
 
   void take_object_waiters(map<sobject_t, list<Message*> >& m);
   
-  hash_map<sobject_t, list<Message*> > waiting_for_wr_unlock; 
-
   bool block_if_wrlocked(MOSDOp* op, object_info_t& oi);
 
 

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index fcfc2b4a3db8b27bb8038bc00d77036f3e7f5bd7..cbe29e2257da8692179850980217a11ec003ebe1 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2378,43 +2378,6 @@ void ReplicatedPG::op_applied(RepGather *repop)
   }
   update_stats();
 
-#if 0
-  // any completion stuff to do here?
-  if (repop->ctx->ops.size()) {
-    const sobject_t& soid = repop->ctx->obs->oi.soid;
-    OSDOp& first = repop->ctx->ops[0];
-
-    switch (first.op.op) { 
-    case CEPH_OSD_OP_UNBALANCEREADS:
-      dout(0) << "op_applied  completed unbalance-reads on " << oid << dendl;
-      unbalancing_reads.erase(oid);
-      if (waiting_for_unbalanced_reads.count(oid)) {
-       osd->take_waiters(waiting_for_unbalanced_reads[oid]);
-       waiting_for_unbalanced_reads.erase(oid);
-      }
-      break;
-
-    case CEPH_OSD_OP_BALANCEREADS:
-      dout(0) << "op_applied  completed balance-reads on " << oid << dendl;
-      /*
-       if (waiting_for_balanced_reads.count(oid)) {
-       osd->take_waiters(waiting_for_balanced_reads[oid]);
-       waiting_for_balanced_reads.erase(oid);
-       }
-      */
-      break;
-
-    case CEPH_OSD_OP_WRUNLOCK:
-      dout(0) << "op_applied  completed wrunlock on " << soid << dendl;
-      if (waiting_for_wr_unlock.count(soid)) {
-       osd->take_waiters(waiting_for_wr_unlock[soid]);
-       waiting_for_wr_unlock.erase(soid);
-      }
-      break;
-    }   
-  }
-#endif
-
   if (!repop->aborted)
     eval_repop(repop);
 

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index d128fe29642dbf7a35536c891a21c0ce8d365a1f..b89c5aa0c080f1bfd9d74cc3e1e2b9093d793ba6 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -491,10 +491,6 @@ protected:
     return !object_contexts.empty();
   }
 
-  // load balancing
-  set<sobject_t> balancing_reads;
-  set<sobject_t> unbalancing_reads;
-  hash_map<sobject_t, list<Message*> > waiting_for_unbalanced_reads;  // i.e. primary-lock
 
   
   // pull