osd/: add support for rolling back overwritten extents to pg_log_entry_t

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 24027becdadf86028d4dce934962274b5e797e85..683d3147159f645c95151ad798d93d9602cd10b9 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3258,7 +3258,7 @@ void ObjectModDesc::visit(Visitor *visitor) const
   bufferlist::iterator bp = bl.begin();
   try {
     while (!bp.end()) {
-      DECODE_START(1, bp);
+      DECODE_START(max_required_version, bp);
       uint8_t code;
       ::decode(code, bp);
       switch (code) {
@@ -3296,6 +3296,14 @@ void ObjectModDesc::visit(Visitor *visitor) const
        visitor->try_rmobject(old_version);
        break;
       }
+      case ROLLBACK_EXTENTS: {
+       vector<pair<uint64_t, uint64_t> > extents;
+       version_t gen;
+       ::decode(gen, bp);
+       ::decode(extents, bp);
+       visitor->rollback_extents(gen,extents);
+       break;
+      }
       default:
        assert(0 == "Invalid rollback code");
       }
@@ -3309,13 +3317,13 @@ void ObjectModDesc::visit(Visitor *visitor) const
 struct DumpVisitor : public ObjectModDesc::Visitor {
   Formatter *f;
   explicit DumpVisitor(Formatter *f) : f(f) {}
-  void append(uint64_t old_size) {
+  void append(uint64_t old_size) override {
     f->open_object_section("op");
     f->dump_string("code", "APPEND");
     f->dump_unsigned("old_size", old_size);
     f->close_section();
   }
-  void setattrs(map<string, boost::optional<bufferlist> > &attrs) {
+  void setattrs(map<string, boost::optional<bufferlist> > &attrs) override {
     f->open_object_section("op");
     f->dump_string("code", "SETATTRS");
     f->open_array_section("attrs");
@@ -3327,23 +3335,38 @@ struct DumpVisitor : public ObjectModDesc::Visitor {
     f->close_section();
     f->close_section();
   }
-  void rmobject(version_t old_version) {
+  void rmobject(version_t old_version) override {
     f->open_object_section("op");
     f->dump_string("code", "RMOBJECT");
     f->dump_unsigned("old_version", old_version);
     f->close_section();
   }
-  void create() {
+  void try_rmobject(version_t old_version) override {
+    f->open_object_section("op");
+    f->dump_string("code", "TRY_RMOBJECT");
+    f->dump_unsigned("old_version", old_version);
+    f->close_section();
+  }
+  void create() override {
     f->open_object_section("op");
     f->dump_string("code", "CREATE");
     f->close_section();
   }
-  void update_snaps(set<snapid_t> &snaps) {
+  void update_snaps(const set<snapid_t> &snaps) override {
     f->open_object_section("op");
     f->dump_string("code", "UPDATE_SNAPS");
     f->dump_stream("snaps") << snaps;
     f->close_section();
   }
+  void rollback_extents(
+    version_t gen,
+    const vector<pair<uint64_t, uint64_t> > &extents) override {
+    f->open_object_section("op");
+    f->dump_string("code", "ROLLBACK_EXTENTS");
+    f->dump_unsigned("gen", gen);
+    f->dump_stream("snaps") << extents;
+    f->close_section();
+  }
 };
 
 void ObjectModDesc::dump(Formatter *f) const
@@ -3383,7 +3406,7 @@ void ObjectModDesc::generate_test_instances(list<ObjectModDesc*>& o)
 
 void ObjectModDesc::encode(bufferlist &_bl) const
 {
-  ENCODE_START(1, 1, _bl);
+  ENCODE_START(max_required_version, max_required_version, _bl);
   ::encode(can_local_rollback, _bl);
   ::encode(rollback_info_completed, _bl);
   ::encode(bl, _bl);
@@ -3391,7 +3414,8 @@ void ObjectModDesc::encode(bufferlist &_bl) const
 }
 void ObjectModDesc::decode(bufferlist::iterator &_bl)
 {
-  DECODE_START(1, _bl);
+  DECODE_START(2, _bl);
+  max_required_version = struct_v;
   ::decode(can_local_rollback, _bl);
   ::decode(rollback_info_completed, _bl);
   ::decode(bl, _bl);

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 67c9e8153ef408f70235a6b3569ebd3912f92eb6..431dc05478f0b090d9e740bcb2ce1aeedcd541e1 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2588,6 +2588,9 @@ class PGBackend;
 class ObjectModDesc {
   bool can_local_rollback;
   bool rollback_info_completed;
+
+  // version required to decode, reflected in encode/decode version
+  __u8 max_required_version = 1;
 public:
   class Visitor {
   public:
@@ -2604,7 +2607,10 @@ public:
       rmobject(old_version);
     }
     virtual void create() {}
-    virtual void update_snaps(set<snapid_t> &old_snaps) {}
+    virtual void update_snaps(const set<snapid_t> &old_snaps) {}
+    virtual void rollback_extents(
+      version_t gen,
+      const vector<pair<uint64_t, uint64_t> > &extents) {}
     virtual ~Visitor() {}
   };
   void visit(Visitor *visitor) const;
@@ -2615,7 +2621,8 @@ public:
     DELETE = 3,
     CREATE = 4,
     UPDATE_SNAPS = 5,
-    TRY_DELETE = 6
+    TRY_DELETE = 6,
+    ROLLBACK_EXTENTS = 7
   };
   ObjectModDesc() : can_local_rollback(true), rollback_info_completed(false) {}
   void claim(ObjectModDesc &other) {
@@ -2624,16 +2631,22 @@ public:
     can_local_rollback = other.can_local_rollback;
     rollback_info_completed = other.rollback_info_completed;
   }
+  void claim_append(ObjectModDesc &other) {
+    if (!can_local_rollback || rollback_info_completed)
+      return;
+    if (!other.can_local_rollback) {
+      mark_unrollbackable();
+      return;
+    }
+    bl.claim_append(other.bl);
+    rollback_info_completed = other.rollback_info_completed;
+  }
   void swap(ObjectModDesc &other) {
     bl.swap(other.bl);
 
-    bool temp = other.can_local_rollback;
-    other.can_local_rollback = can_local_rollback;
-    can_local_rollback = temp;
-
-    temp = other.rollback_info_completed;
-    other.rollback_info_completed = rollback_info_completed;
-    rollback_info_completed = temp;
+    ::swap(other.can_local_rollback, can_local_rollback);
+    ::swap(other.rollback_info_completed, rollback_info_completed);
+    ::swap(other.max_required_version, max_required_version);
   }
   void append_id(ModID id) {
     uint8_t _id(id);
@@ -2691,6 +2704,18 @@ public:
     ::encode(old_snaps, bl);
     ENCODE_FINISH(bl);
   }
+  void rollback_extents(
+    version_t gen, const vector<pair<uint64_t, uint64_t> > &extents) {
+    assert(can_local_rollback);
+    assert(!rollback_info_completed);
+    if (max_required_version < 2)
+      max_required_version = 2;
+    ENCODE_START(2, 2, bl);
+    append_id(ROLLBACK_EXTENTS);
+    ::encode(gen, bl);
+    ::encode(extents, bl);
+    ENCODE_FINISH(bl);
+  }
 
   // cannot be rolled back
   void mark_unrollbackable() {
@@ -2704,6 +2729,10 @@ public:
     return can_local_rollback && (bl.length() == 0);
   }
 
+  bool requires_kraken() const {
+    return max_required_version >= 2;
+  }
+
   /**
    * Create fresh copy of bl bytes to avoid keeping large buffers around
    * in the case that bl contains ptrs which point into a much larger
@@ -2815,6 +2844,18 @@ struct pg_log_entry_t {
     return op == DELETE || op == LOST_DELETE;
   }
 
+  bool can_rollback() const {
+    return mod_desc.can_rollback();
+  }
+
+  void mark_unrollbackable() {
+    mod_desc.mark_unrollbackable();
+  }
+
+  bool requires_kraken() const {
+    return mod_desc.requires_kraken();
+  }
+
   // Errors are only used for dup detection, whereas
   // the index by objects is used by recovery, copy_get,
   // and other facilities that don't expect or need to
@@ -2828,8 +2869,6 @@ struct pg_log_entry_t {
       (op == MODIFY || op == DELETE || op == ERROR);
   }
 
-  bool is_rollforward() const { /* TODO */ return false; }
-
   string get_key_name() const;
   void encode_with_checksum(bufferlist& bl) const;
   void decode_with_checksum(bufferlist::iterator& p);

diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc
index d232288e94fa040719b3b32210e29821ca34bbc1..ee180e6168cb5bf75e1f3a35f7e635b8e0e19868 100644 (file)
--- a/src/test/osd/TestPGLog.cc
+++ b/src/test/osd/TestPGLog.cc
@@ -50,7 +50,7 @@ public:
   static pg_log_entry_t mk_ple_mod(
     const hobject_t &hoid, eversion_t v, eversion_t pv) {
     pg_log_entry_t e;
-    e.mod_desc.mark_unrollbackable();
+    e.mark_unrollbackable();
     e.op = pg_log_entry_t::MODIFY;
     e.soid = hoid;
     e.version = v;
@@ -60,7 +60,7 @@ public:
   static pg_log_entry_t mk_ple_dt(
     const hobject_t &hoid, eversion_t v, eversion_t pv) {
     pg_log_entry_t e;
-    e.mod_desc.mark_unrollbackable();
+    e.mark_unrollbackable();
     e.op = pg_log_entry_t::DELETE;
     e.soid = hoid;
     e.version = v;
@@ -345,7 +345,7 @@ TEST_F(PGLogTest, rewind_divergent_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 1);
       e.soid.set_hash(0x5);
@@ -425,7 +425,7 @@ TEST_F(PGLogTest, rewind_divergent_log) {
     eversion_t newhead;
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       info.log_tail = log.tail = eversion_t(1, 1);
       newhead = eversion_t(1, 3);
@@ -474,14 +474,14 @@ TEST_F(PGLogTest, rewind_divergent_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
       e.version = eversion_t(1, 5);
       e.soid.set_hash(0x9);
       add(e);
     }
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
       e.version = eversion_t(1, 6);
       e.soid.set_hash(0x10);
       add(e);
@@ -502,7 +502,7 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
@@ -537,7 +537,7 @@ TEST_F(PGLogTest, merge_old_entry) {
     list<hobject_t> remove_snap;
 
     pg_log_entry_t ne;
-    ne.mod_desc.mark_unrollbackable();
+    ne.mark_unrollbackable();
     ne.version = eversion_t(2,1);
     log.add(ne);
 
@@ -552,7 +552,7 @@ TEST_F(PGLogTest, merge_old_entry) {
     {
       log.log.front().op = pg_log_entry_t::DELETE;
       pg_log_entry_t oe;
-      oe.mod_desc.mark_unrollbackable();
+      oe.mark_unrollbackable();
       oe.version = eversion_t(1,1);
 
       TestHandler h(remove_snap);
@@ -565,7 +565,7 @@ TEST_F(PGLogTest, merge_old_entry) {
       ne.op = pg_log_entry_t::MODIFY;
       missing.add_next_event(ne);
       pg_log_entry_t oe;
-      oe.mod_desc.mark_unrollbackable();
+      oe.mark_unrollbackable();
       oe.version = eversion_t(1,1);
 
       TestHandler h(remove_snap);
@@ -592,12 +592,12 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
     pg_log_entry_t ne;
-    ne.mod_desc.mark_unrollbackable();
+    ne.mark_unrollbackable();
     ne.version = eversion_t(1,1);
     ne.op = pg_log_entry_t::DELETE;
     log.add(ne);
@@ -630,12 +630,12 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
     pg_log_entry_t ne;
-    ne.mod_desc.mark_unrollbackable();
+    ne.mark_unrollbackable();
     ne.version = eversion_t(1,1);
     ne.op = pg_log_entry_t::DELETE;
     log.add(ne);
@@ -671,7 +671,7 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
@@ -709,7 +709,7 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
@@ -746,7 +746,7 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
@@ -784,7 +784,7 @@ TEST_F(PGLogTest, merge_old_entry) {
 
     ObjectStore::Transaction t;
     pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
+    oe.mark_unrollbackable();
     pg_info_t info;
     list<hobject_t> remove_snap;
 
@@ -967,7 +967,7 @@ TEST_F(PGLogTest, merge_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 4);
       e.soid.set_hash(0x5);
@@ -1064,7 +1064,7 @@ TEST_F(PGLogTest, merge_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 1);
       e.soid.set_hash(0x5);
@@ -1177,7 +1177,7 @@ TEST_F(PGLogTest, merge_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 1);
       e.soid.set_hash(0x5);
@@ -1291,7 +1291,7 @@ TEST_F(PGLogTest, merge_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       log.tail = eversion_t();
       e.version = eversion_t(1, 1);
@@ -1386,7 +1386,7 @@ TEST_F(PGLogTest, proc_replica_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 2);
       e.soid.set_hash(0x5);
@@ -1437,7 +1437,7 @@ TEST_F(PGLogTest, proc_replica_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       {
        e.soid = divergent_object;
@@ -1571,7 +1571,7 @@ TEST_F(PGLogTest, proc_replica_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 1);
       e.soid = divergent_object;
@@ -1659,7 +1659,7 @@ TEST_F(PGLogTest, proc_replica_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 1);
       e.soid = divergent_object;
@@ -1754,7 +1754,7 @@ TEST_F(PGLogTest, proc_replica_log) {
 
     {
       pg_log_entry_t e;
-      e.mod_desc.mark_unrollbackable();
+      e.mark_unrollbackable();
 
       e.version = eversion_t(1, 1);
       e.soid.set_hash(0x9);