From ecbdeb19ff3297ec44df199aaa94bbf2bb641c9f Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 22 Jan 2014 11:55:16 -0800 Subject: [PATCH] PGBackend: clarify rollback_stash name and method comments Signed-off-by: Samuel Just --- src/osd/PGBackend.cc | 2 +- src/osd/PGBackend.h | 10 +++++----- src/osd/ReplicatedBackend.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 11c29cd8733c..80e289ed5af3 100644 --- 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 cda7db383f37..8c527d65086e 100644 --- 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 > &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 4f4ae6454af6..025bad3370bf 100644 --- 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) { -- 2.47.3