src/test: remove unused values in SetChunkOp

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

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index d5689f6067af7b687040645032189bb12f4e2761..b0a907d0c9dc98edaea76cef7fc8c12559794ad1 100644 (file)
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -2287,12 +2287,10 @@ public:
 
 class SetChunkOp : public TestOp {
 public:
-  string oid, oid_tgt, tgt_pool_name;
+  string oid, oid_tgt;
   ObjectDesc src_value, tgt_value;
   librados::ObjectReadOperation op;
-  librados::ObjectReadOperation rd_op;
   librados::AioCompletion *comp;
-  std::shared_ptr<int> in_use;
   int done;
   int r;
   uint64_t offset;
@@ -2304,11 +2302,10 @@ public:
             uint64_t offset,
             uint32_t length,
             const string &oid_tgt,
-            const string &tgt_pool_name,
             uint64_t tgt_offset,
             TestOpStat *stat = 0)
     : TestOp(n, context, stat),
-      oid(oid), oid_tgt(oid_tgt), tgt_pool_name(tgt_pool_name),
+      oid(oid), oid_tgt(oid_tgt),
       comp(NULL), done(0), 
       r(0), offset(offset), length(length), 
       tgt_offset(tgt_offset)
@@ -2320,8 +2317,6 @@ public:
     context->oid_in_use.insert(oid);
     context->oid_not_in_use.erase(oid);
 
-    if (tgt_pool_name.empty()) ceph_abort();
-
     context->find_object(oid, &src_value); 
     context->find_object(oid_tgt, &tgt_value);
 

diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc
index 3be5699cac3755d9c1d4a6ade087292466473809..e4021a036529d9750e91f01a87f8722c50bd5522 100644 (file)
--- a/src/test/osd/TestRados.cc
+++ b/src/test/osd/TestRados.cc
@@ -246,7 +246,7 @@ public:
             << " 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(), 
-                             context.low_tier_pool_name, rand_tgt_offset, m_stats);
+                           rand_tgt_offset, m_stats);
        return true;
       }
     } else if (m_op == make_manifest_end + 1) {