osd: recover_primary_got() -> recover_got()

This is called on primary and replicas alike.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 170d48471c5ce73fae7807810757e1ac106720dc..9906219a68ab53808f3d1774e4de6713edf93a15 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4397,7 +4397,7 @@ void ReplicatedPG::_applied_pushed_object(ObjectStore::Transaction *t, ObjectCon
   delete t;
 }
 
-void ReplicatedPG::recover_primary_got(hobject_t oid, eversion_t v)
+void ReplicatedPG::recover_got(hobject_t oid, eversion_t v)
 {
   if (missing.is_missing(oid, v)) {
     dout(10) << "got missing " << oid << " v " << v << dendl;
@@ -4656,7 +4656,7 @@ void ReplicatedPG::sub_op_push(MOSDSubOp *op)
       }
     }
 
-    recover_primary_got(soid, v);
+    recover_got(soid, v);
 
     // update pg
     write_info(*t);
@@ -5294,7 +5294,7 @@ int ReplicatedPG::recover_primary(int max)
              obc->obs.oi.encode(b2);
              t->setattr(coll, soid, OI_ATTR, b2);
 
-             recover_primary_got(soid, latest->version);
+             recover_got(soid, latest->version);
 
              osd->store->queue_transaction(&osr, t,
                                            new C_OSD_AppliedPushedObject(this, t, obc),

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 7ad3a3f6278b758ee18282d6cfe9105301804958..6037cd2e9b6786b7291cd2ec8c2e2fe9450762f7 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -747,7 +747,7 @@ protected:
   void sub_op_modify_reply(MOSDSubOpReply *reply);
   void _applied_pushed_object(ObjectStore::Transaction *t, ObjectContext *obc);
   void _committed_pushed_object(MOSDSubOp *op, epoch_t same_since, eversion_t lc);
-  void recover_primary_got(hobject_t oid, eversion_t v);
+  void recover_got(hobject_t oid, eversion_t v);
   void sub_op_push(MOSDSubOp *op);
   void _failed_push(MOSDSubOp *op);
   void sub_op_push_reply(MOSDSubOpReply *reply);