From: myoungwon oh <omwmw@sk.com>
Date: Wed, 24 Jan 2018 09:59:08 +0000 (+0900)
Subject: src/test/osd/RadosModel: modify SetCunk to support two pool
X-Git-Tag: v13.0.2~430^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d848bc8a7dd2938152db0cb8918a9f4f23c0cf93;p=ceph.git

src/test/osd/RadosModel: modify SetCunk to support two pool

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
---

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 94909cb986adb..6f086ddffae9a 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -2328,12 +2328,15 @@ 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);
 
     if (src_value.version != 0 && !src_value.deleted())
       op.assert_version(src_value.version);
-    op.set_chunk(offset, length, context->io_ctx, context->prefix+oid_tgt, tgt_offset);
+    op.set_chunk(offset, length, context->low_tier_io_ctx, 
+		 context->prefix+oid_tgt, tgt_offset);
 
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc
index 2ef3309f71a3b..9a4cfedb6e491 100644
--- a/src/test/osd/TestRados.cc
+++ b/src/test/osd/TestRados.cc
@@ -234,7 +234,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.pool_name, rand_tgt_offset, m_stats);
+			      context.low_tier_pool_name, rand_tgt_offset, m_stats);
 	return true;
       }
     } else if (m_op == make_manifest_end + 1) {