From 67fe9a3fe1f60c10a32bfb4f1f6ef2c1499a8f7e Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Mon, 8 Feb 2021 11:33:17 +0900 Subject: [PATCH] src/test: allow EOPNOTSUPP in SetChunkOp Because tier-flush creates new chunks in the manifest object using CDC, SetChunkOp from ceph_test_rados can issue overlapped offset Signed-off-by: Myoungwon Oh --- src/test/osd/RadosModel.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 63933a5e2bf..cc0aa71f18d 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -2399,23 +2399,9 @@ public: context->oid_set_chunk_tgt_pool.end()) { cout << num << ": get expected ENOENT tgt oid " << oid_tgt << std::endl; } else if (r == -EOPNOTSUPP) { - bool is_overlapped = false; - interval_set chunk; - chunk.insert(offset, length); - for (auto &p : src_value.chunk_info) { - if (chunk.intersects(p.first, p.second.length)) { - cout << " range is overlapped offset: " << offset << " length: " << length - << " chunk_info offset: " << p.second.offset << " length " - << p.second.length << std::endl; - is_overlapped = true; - context->update_object_version(oid, comp->get_version64()); - } - } - if (!is_overlapped) { - cerr << "Error: oid " << oid << " set_chunk " << oid_tgt << " returned error code " - << r << " offset: " << offset << " length: " << length << std::endl; - ceph_abort(); - } + cout << "Range is overlapped: oid " << oid << " set_chunk " << oid_tgt << " returned error code " + << r << " offset: " << offset << " length: " << length << std::endl; + context->update_object_version(oid, comp->get_version64()); } else { cerr << "Error: oid " << oid << " set_chunk " << oid_tgt << " returned error code " << r << std::endl; -- 2.47.3