From 04ffe1c5533c15e55f3c4c24582746bf6462cdae Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Sun, 9 Aug 2020 20:40:09 +0900 Subject: [PATCH] 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 --- src/test/osd/RadosModel.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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(); } -- 2.47.3