From: myoungwon oh <ohmyoungwon@gmail.com>
Date: Sun, 9 Aug 2020 11:40:09 +0000 (+0900)
Subject: test: Consider a tier_promote case deleting redirect info
X-Git-Tag: v16.1.0~1248^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04ffe1c5533c15e55f3c4c24582746bf6462cdae;p=ceph.git

test: Consider a tier_promote case deleting redirect info

Since calling tier_promote triggers to remove redirect
manifest info in the target object, unset_manifest can get
the response with EOPNOTSUPP

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

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index f9ed4436715..f71abc552a5 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -2464,14 +2464,13 @@ public:
       /* unset redirect target */
       comp = context->rados.aio_create_completion();
       bool present = !src_value.deleted();
-      context->remove_object(oid);
-      op.remove();
+      op.unset_manifest();
       context->io_ctx.aio_operate(context->prefix+oid, comp, &op,
 				  librados::OPERATION_ORDER_READS_WRITES |
 				  librados::OPERATION_IGNORE_REDIRECT);
       comp->wait_for_complete();
       if ((r = comp->get_return_value())) {
-	if (!(r == -ENOENT && !present)) {
+	if (!(r == -ENOENT && !present) && r != -EOPNOTSUPP) {
 	  cerr << "r is " << r << " while deleting " << oid << " and present is " << present << std::endl;
 	  ceph_abort();
 	}