From: myoungwon oh <ohmyoungwon@gmail.com>
Date: Fri, 28 Aug 2020 02:47:09 +0000 (+0900)
Subject: test: fix to use set-chunk (with reference)
X-Git-Tag: v16.1.0~1248^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf533c0b1d84790afc19bca30f1e44ed53ec8b1e;p=ceph.git

test: fix to use set-chunk (with reference)

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

diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc
index f02a4cc44433..d38daf3865cc 100644
--- a/src/test/librados/tier_cxx.cc
+++ b/src/test/librados/tier_cxx.cc
@@ -3079,16 +3079,8 @@ TEST_F(LibRadosTwoPoolsPP, ManifestPromoteRead) {
     completion->release();
   }
   // set-chunk
-  {
-    ObjectReadOperation op;
-    op.set_chunk(0, 2, cache_ioctx, "bar-chunk", 0);
-    librados::AioCompletion *completion = cluster.aio_create_completion();
-    ASSERT_EQ(0, ioctx.aio_operate("foo-chunk", completion, &op,
-	      librados::OPERATION_IGNORE_CACHE, NULL));
-    completion->wait_for_complete();
-    ASSERT_EQ(0, completion->get_return_value());
-    completion->release();
-  }
+  manifest_set_chunk(cluster, cache_ioctx, ioctx, 0, 2, "bar-chunk", "foo-chunk");
+
   // promote
   {
     ObjectWriteOperation op;
@@ -7211,16 +7203,7 @@ TEST_F(LibRadosTwoPoolsECPP, SetChunkRead) {
   cluster.wait_for_latest_osdmap();
 
   // set_chunk
-  {
-    ObjectReadOperation op;
-    op.set_chunk(0, 4, cache_ioctx, "bar", 0);
-    librados::AioCompletion *completion = cluster.aio_create_completion();
-    ASSERT_EQ(0, ioctx.aio_operate("foo", completion, &op,
-	      librados::OPERATION_IGNORE_CACHE, NULL));
-    completion->wait_for_complete();
-    ASSERT_EQ(0, completion->get_return_value());
-    completion->release();
-  }
+  manifest_set_chunk(cluster, cache_ioctx, ioctx, 0, 4, "bar", "foo");
 
   // promote
   {
@@ -7293,16 +7276,7 @@ TEST_F(LibRadosTwoPoolsECPP, ManifestPromoteRead) {
     completion->release();
   }
   // set-chunk
-  {
-    ObjectReadOperation op;
-    op.set_chunk(0, 10, cache_ioctx, "bar-chunk", 0);
-    librados::AioCompletion *completion = cluster.aio_create_completion();
-    ASSERT_EQ(0, ioctx.aio_operate("foo-chunk", completion, &op,
-	      librados::OPERATION_IGNORE_CACHE, NULL));
-    completion->wait_for_complete();
-    ASSERT_EQ(0, completion->get_return_value());
-    completion->release();
-  }
+  manifest_set_chunk(cluster, cache_ioctx, ioctx, 0, 10, "bar-chunk", "foo-chunk");
   // promote
   {
     ObjectWriteOperation op;