Merge commit 'origin/unstable' into snap

Conflicts:

	src/client/SyntheticClient.cc
	src/osd/ReplicatedPG.cc
	src/vstartnew.sh

diff --cc src/client/SyntheticClient.cc
index b732383e4130bab1f1face9553e93df302dffae8,f11ff4fcc5eed09074b7e2316c797dbb5d053583..eaba4dac21ef441da0f469262f51951d78912ed5
--- 1/src/client/SyntheticClient.cc
--- 2/src/client/SyntheticClient.cc
+++ b/src/client/SyntheticClient.cc
@@@ -57,18 -57,9 +57,18 @@@ void parse_syn_options(vector<const cha
      if (strcmp(args[i],"--syn") == 0) {
        ++i;
  
 -      if (strcmp(args[i],"rmfile") == 0) {
 +      if (strcmp(args[i], "mksnap") == 0) {
 +      syn_modes.push_back(SYNCLIENT_MODE_MKSNAP);
 +      syn_sargs.push_back(args[++i]); // path
 +      syn_sargs.push_back(args[++i]); // name
 +      }
 +      else if (strcmp(args[i], "rmsnap") == 0) {
 +      syn_modes.push_back(SYNCLIENT_MODE_RMSNAP);
 +      syn_sargs.push_back(args[++i]); // path
 +      syn_sargs.push_back(args[++i]); // name
-       }
- 
-       else if (strcmp(args[i],"writefile") == 0) {
++      } else if (strcmp(args[i],"rmfile") == 0) {
+         syn_modes.push_back( SYNCLIENT_MODE_RMFILE );
+       } else if (strcmp(args[i],"writefile") == 0) {
          syn_modes.push_back( SYNCLIENT_MODE_WRITEFILE );
          syn_iargs.push_back( atoi(args[++i]) );
          syn_iargs.push_back( atoi(args[++i]) );

diff --cc src/client/SyntheticClient.h
Simple merge

diff --cc src/config.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
index 952ea6e5d072ca577184b9824acc7a8884dcb99c,0447f58d0dc59e85c8018461201d5476e238318f..1737b082b9c043462472432b576acfb5ec3031de
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -1350,14 -1271,34 +1350,28 @@@ void ReplicatedPG::op_modify(MOSDOp *op
  
  void ReplicatedPG::sub_op_modify(MOSDSubOp *op)
  {
 -  pobject_t poid = op->get_poid();
 -  eversion_t nv = op->get_version();
 -
 -  const char *opname = MOSDOp::get_opname(op->get_op());
 -
 -  // check crev
 -  objectrev_t crev = 0;
 -  osd->store->getattr(info.pgid, poid, "crev", (char*)&crev, sizeof(crev));
 -
 +  pobject_t poid = op->poid;
 +  const char *opname = MOSDOp::get_opname(op->op);
 +  
    dout(10) << "sub_op_modify " << opname 
             << " " << poid 
 -           << " v " << nv 
 -           << " " << op->get_offset() << "~" << op->get_length()
 -           << dendl;  
 +           << " v " << op->version
 +         << " " << op->offset << "~" << op->length
 +         << dendl;  
+ 
+   // sanity checks
 -  if (op->get_map_epoch() < info.history.same_primary_since) {
++  if (op->map_epoch < info.history.same_primary_since) {
+     dout(10) << "sub_op_modify discarding old sub_op from "
 -           << op->get_map_epoch() << " < " << info.history.same_primary_since << dendl;
++           << op->map_epoch << " < " << info.history.same_primary_since << dendl;
+     delete op;
+     return;
+   }
+   if (!is_active()) {
+     dout(10) << "sub_op_modify not active" << dendl;
+     delete op;
+     return;
+   }
+   assert(is_replica());
    
    // note peer's stat
    int fromosd = op->get_source().num();
@@@ -1549,39 -1491,22 +1564,22 @@@ void ReplicatedPG::sub_op_push_reply(MO
   */
  void ReplicatedPG::sub_op_pull(MOSDSubOp *op)
  {
 -  const pobject_t poid = op->get_poid();
 -  const eversion_t v = op->get_version();
 +  const pobject_t poid = op->poid;
 +  const eversion_t v = op->version;
-   int from = op->get_source().num();
  
 -  dout(7) << "op_pull " << poid << " v " << op->get_version()
 +  dout(7) << "op_pull " << poid << " v " << op->version
            << " from " << op->get_source()
            << dendl;
  
-   // is a replica asking?  are they missing it?
-   if (is_primary()) {
-     // primary
-     assert(peer_missing.count(from));  // we had better know this, from the peering process.
 -  if (op->get_map_epoch() < info.history.same_primary_since) {
++  if (op->map_epoch < info.history.same_primary_since) {
+     dout(10) << "sub_op_pull discarding old sub_op from "
 -           << op->get_map_epoch() << " < " << info.history.same_primary_since << dendl;
++           << op->map_epoch << " < " << info.history.same_primary_since << dendl;
+     delete op;
+     return;
+   }
  
-     if (!peer_missing[from].is_missing(poid.oid)) {
-       dout(7) << "op_pull replica isn't actually missing it, we must have already pushed to them" << dendl;
-       delete op;
-       return;
-     }
+   assert(!is_primary());  // we should be a replica or stray.
  
-     // do we have it yet?
-     if (is_missing_object(poid.oid)) {
-       wait_for_missing_object(poid.oid, op);
-       return;
-     }
-   } else {
-     // non-primary
-     if (missing.is_missing(poid.oid)) {
-       dout(7) << "op_pull not primary, and missing " << poid << ", ignoring" << dendl;
-       delete op;
-       return;
-     }
-   }
-     
    // push it back!
    push(poid, op->get_source().num());
  }
@@@ -1592,22 -1517,43 +1590,43 @@@
   */
  void ReplicatedPG::sub_op_push(MOSDSubOp *op)
  {
 -  pobject_t poid = op->get_poid();
 -  eversion_t v = op->get_version();
 +  pobject_t poid = op->poid;
 +  eversion_t v = op->version;
  
-   if (!is_missing_object(poid.oid)) {
-     dout(7) << "sub_op_push not missing " << poid << dendl;
-     dout(15) << " but i AM missing " << missing.missing << dendl;
-     return;
-   }
-   
    dout(7) << "op_push " 
            << poid 
            << " v " << v 
 -          << " size " << op->get_length() << " " << op->get_data().length()
 +          << " size " << op->length << " " << op->get_data().length()
            << dendl;
  
 -    if (op->get_map_epoch() < info.history.same_primary_since) {
+   if (is_replica()) {
+     // replica should only accept pushes from the current primary.
 -             << op->get_map_epoch() << " < " << info.history.same_primary_since << dendl;
++    if (op->map_epoch < info.history.same_primary_since) {
+       dout(10) << "sub_op_push discarding old sub_op from "
 -  assert(op->get_data().length() == op->get_length());
++             << op->map_epoch << " < " << info.history.same_primary_since << dendl;
+       delete op;
+       return;
+     }
+     // FIXME: actually, no, what i really want here is a personal "same_role_since"
+     if (!is_active()) {
+       dout(10) << "sub_op_push not active" << dendl;
+       delete op;
+       return;
+     }
+   } else {
+     // primary will accept pushes anytime.
+   }
+ 
+   // are we missing (this specific version)?
+   //  (if version is wrong, it is either old (we don't want it) or 
+   //   newer (peering is buggy))
+   if (!missing.is_missing(poid.oid, v)) {
+     dout(7) << "sub_op_push not missing " << poid << " v" << v << dendl;
+     dout(15) << " but i AM missing " << missing.missing << dendl;
+     return;
+   }
+   
 +  assert(op->get_data().length() == op->length);
    
    // write object and add it to the PG
    ObjectStore::Transaction t;

diff --cc src/osd/ReplicatedPG.h
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/osdc/Objecter.h
Simple merge

diff --cc src/vstartnew.sh
Simple merge