src/test: make SetChunkOp to set snapshot

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index cc0aa71f18df5f2878128ba5327fc52ad09b3a7d..f19d63bb711f8abc08f554e6f50b5c7f213ef5a1 100644 (file)
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -2330,32 +2330,59 @@ public:
   uint64_t offset;
   uint32_t length;
   uint32_t tgt_offset;
+  int snap;
+  std::shared_ptr<int> in_use;
   SetChunkOp(int n,
             RadosTestContext *context,
             const string &oid,
-            uint64_t offset,
-            uint32_t length,
             const string &oid_tgt,
-            uint32_t tgt_offset,
             TestOpStat *stat = 0)
     : TestOp(n, context, stat),
       oid(oid), oid_tgt(oid_tgt),
       comp(NULL), done(0), 
-      r(0), offset(offset), length(length), 
-      tgt_offset(tgt_offset)
+      r(0), offset(0), length(0), 
+      tgt_offset(0),
+      snap(0)
   {}
 
+  void get_rand_off_len(uint64_t &rand_offset, uint32_t &rand_length, uint32_t max_len) {
+    rand_offset = rand() % max_len;
+    rand_length = rand() % max_len;
+    rand_offset = rand_offset - (rand_offset % 512);
+    rand_length = rand_length - (rand_length % 512);
+
+    while (rand_offset + rand_length > max_len || rand_length == 0) {
+      rand_offset = rand() % max_len;
+      rand_length = rand() % max_len;
+      rand_offset = rand_offset - (rand_offset % 512);
+      rand_length = rand_length - (rand_length % 512);
+    }
+  }
+
   void _begin() override
   {
     std::lock_guard l{context->state_lock};
+    if (!(rand() % 4) && !context->snaps.empty()) {
+      snap = rand_choose(context->snaps)->first;
+      in_use = context->snaps_in_use.lookup_or_create(snap, snap);
+    } else {
+      snap = -1;
+    }
     context->oid_in_use.insert(oid);
     context->oid_not_in_use.erase(oid);
 
-    context->find_object(oid, &src_value); 
+    context->find_object(oid, &src_value, snap); 
     context->find_object(oid_tgt, &tgt_value);
 
-    if (src_value.version != 0 && !src_value.deleted())
+    uint32_t max_len = src_value.most_recent_gen()->get_length(src_value.most_recent());
+    if (snap >= 0) {
+      context->io_ctx.snap_set_read(context->snaps[snap]);
+      get_rand_off_len(offset, length, max_len);
+    } else if (src_value.version != 0 && !src_value.deleted()) {
       op.assert_version(src_value.version);
+      get_rand_off_len(offset, length, max_len);
+    }
+    tgt_offset = offset;
 
     string target_oid;
     if (!oid_tgt.empty()) {
@@ -2371,7 +2398,9 @@ public:
       tgt_offset = 0;
     }
 
-    cout << num << ": target oid " << target_oid << " offset " << tgt_offset << std::endl;
+    cout << num << ": " << "set_chunk oid " << oid << " offset: " << offset
+         << " length: " << length <<  " target oid " << target_oid
+         << " offset: " << tgt_offset << std::endl;
 
     op.set_chunk(offset, length, context->low_tier_io_ctx, 
                 context->prefix+target_oid, tgt_offset, CEPH_OSD_OP_FLAG_WITH_REFERENCE);
@@ -2383,6 +2412,9 @@ public:
                                                &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op,
                                librados::OPERATION_ORDER_READS_WRITES, NULL);
+    if (snap >= 0) {
+      context->io_ctx.snap_set_read(0);
+    }
   }
 
   void _finish(CallbackInfo *info) override
@@ -2408,9 +2440,11 @@ public:
          ceph_abort();
        }
       } else {
-       ChunkDesc info {tgt_offset, length, oid_tgt};
-       context->update_object_chunk_target(oid, offset, info);
-       context->update_object_version(oid, comp->get_version64());
+       if (snap == -1) {
+         ChunkDesc info {tgt_offset, length, oid_tgt};
+         context->update_object_chunk_target(oid, offset, info);
+         context->update_object_version(oid, comp->get_version64());
+       }
       }
     }
 

diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc
index afb786c775f129fee47570ffde99541eea42dbc3..2f64ff8828ffc20832ac3ecb577f1e733d4f2ac0 100644 (file)
--- a/src/test/osd/TestRados.cc
+++ b/src/test/osd/TestRados.cc
@@ -224,17 +224,9 @@ public:
          oid2 << " " << string(300, 'm');
        }
 
-       /* make a chunk (random offset, random length --> 
-        * target object's random offset)
-        */
-       uint32_t rand_offset = 0, rand_length = 0;
-       get_rand_off_len(context, oid.str(), rand_offset, rand_length);
-       uint32_t rand_tgt_offset = rand_offset;
-       cout << m_op << ": " << "set_chunk oid " << oid.str() << " offset: " << rand_offset 
-            << " length: " << rand_length <<  " target oid " << oid2.str() 
-            << " tgt_offset: " << rand_tgt_offset << std::endl;
-       op = new SetChunkOp(m_op, &context, oid.str(), rand_offset, rand_length, oid2.str(), 
-                           rand_tgt_offset, m_stats);
+       cout << m_op << ": " << "set_chunk oid " << oid.str() 
+            <<  " target oid " << oid2.str()  << std::endl;
+       op = new SetChunkOp(m_op, &context, oid.str(), oid2.str(), m_stats);
        return true;
       }
     } else if (m_op == make_manifest_end + 1) {
@@ -262,23 +254,6 @@ public:
     return false;
   }
 
-  void get_rand_off_len(RadosTestContext &context, string oid, uint32_t &rand_offset, uint32_t &rand_length) {
-    ObjectDesc contents;
-    context.find_object(oid, &contents);
-    uint32_t max_len = contents.most_recent_gen()->get_length(contents.most_recent());
-    rand_offset = rand() % max_len;
-    rand_length = rand() % max_len;
-    rand_offset = rand_offset - (rand_offset % 512);
-    rand_length = rand_length - (rand_length % 512);
-
-    while (rand_offset + rand_length > max_len || rand_length == 0) {
-      rand_offset = rand() % max_len;
-      rand_length = rand() % max_len;
-      rand_offset = rand_offset - (rand_offset % 512);
-      rand_length = rand_length - (rand_length % 512);
-    }
-  }
-
 private:
 
   TestOp *gen_op(RadosTestContext &context, TestOpType type)
@@ -449,12 +424,9 @@ private:
       {
        ceph_assert(m_enable_dedup);
        oid = *(rand_choose(context.oid_not_in_use));
-       uint32_t rand_offset = 0, rand_length = 0;
-       get_rand_off_len(context, oid, rand_offset, rand_length);
-       cout << m_op << ": " << "set_chunk oid " << oid << " offset: " << rand_offset 
-            << " length: " << rand_length <<  " target oid " << ""
-            << " tgt_offset: " << rand_offset << std::endl;
-       return new SetChunkOp(m_op, &context, oid, rand_offset, rand_length, "", rand_offset, m_stats);
+       cout << m_op << ": " << "set_chunk oid " << oid 
+            <<  " target oid " << std::endl;
+       return new SetChunkOp(m_op, &context, oid, "", m_stats);
       }
 
     case TEST_OP_TIER_EVICT: