PGBackend: clarify rollback_stash name and method comments

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 11c29cd8733c6d25dd47aa18de314aee497e9b2c..80e289ed5af31b1ecd46e0bf33a21c2060cb442d 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -37,7 +37,7 @@ struct RollbackVisitor : public ObjectModDesc::Visitor {
   }
   void rmobject(version_t old_version) {
     ObjectStore::Transaction temp;
-    pg->rollback_unstash(hoid, old_version, &temp);
+    pg->rollback_stash(hoid, old_version, &temp);
     temp.append(t);
     temp.swap(t);
   }

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index cda7db383f373a55df55fcd266f65b6532f6d34c..8c527d65086e709fbb557d3961d398da2a8ddb59 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -364,25 +364,25 @@
      const ObjectModDesc &desc,
      ObjectStore::Transaction *t);
 
-   /// Rollback reset attrs
+   /// Reapply old attributes
    virtual void rollback_setattrs(
      const hobject_t &hoid,
      map<string, boost::optional<bufferlist> > &old_attrs,
      ObjectStore::Transaction *t) = 0;
 
-   /// Rollback truncate
+   /// Truncate object to rollback append
    virtual void rollback_append(
      const hobject_t &hoid,
      uint64_t old_size,
      ObjectStore::Transaction *t) = 0;
 
-   /// Rollback unstash
-   virtual void rollback_unstash(
+   /// Unstash object to rollback stash
+   virtual void rollback_stash(
      const hobject_t &hoid,
      version_t old_version,
      ObjectStore::Transaction *t) = 0;
 
-   /// Rollback create
+   /// Delete object to rollback create
    virtual void rollback_create(
      const hobject_t &hoid,
      ObjectStore::Transaction *t) = 0;

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 4f4ae6454af66721a589330957d8f8682546b671..025bad3370bf49153906397e91730d23ab02a4e3 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -410,7 +410,7 @@ public:
     t->truncate(coll, hoid, old_size);
   }
 
-  void rollback_unstash(
+  void rollback_stash(
     const hobject_t &hoid,
     version_t old_version,
     ObjectStore::Transaction *t) {