From 6caa92d5d1928aad51c0afa3a4c0f40aa93d8a6f Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Mon, 8 Mar 2021 21:04:35 +0900 Subject: [PATCH] src/test: generate useful log regarding ENOENT Signed-off-by: Myoungwon Oh --- src/test/osd/RadosModel.h | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index e0510e8a2c9..63d93622a30 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -2957,9 +2957,18 @@ public: } else if (r == -EBUSY) { // could fail if snap is not oldest ceph_assert(!context->check_oldest_snap_flushed(oid, snap)); - } else if (r == -ENOENT && src_value.deleted()) { + } else if (r == -ENOENT) { // could fail if object is removed + if (src_value.deleted()) { + cout << num << ": got expected ENOENT (src dne)" << std::endl; + } else { + cerr << num << ": got unexpected ENOENT" << std::endl; + ceph_abort(); + } } else { + if (r != -ENOENT && src_value.deleted()) { + cerr << num << ": src dne, but r is not ENOENT" << std::endl; + } ceph_abort_msg("shouldn't happen"); } context->update_object_tier_flushed(oid, snap); @@ -3052,12 +3061,21 @@ public: if (r == 0) { // ok } else if (r == -EINVAL) { - // modifying manifeset object makes existing chunk_map clear + // modifying manifest object makes existing chunk_map clear // as a result, the modified object is no longer manifest object // this casues to return -EINVAL - } else if (r == -ENOENT && src_value.deleted()) { + } else if (r == -ENOENT) { // could fail if object is removed + if (src_value.deleted()) { + cout << num << ": got expected ENOENT (src dne)" << std::endl; + } else { + cerr << num << ": got unexpected ENOENT" << std::endl; + ceph_abort(); + } } else { + if (r != -ENOENT && src_value.deleted()) { + cerr << num << ": src dne, but r is not ENOENT" << std::endl; + } ceph_abort_msg("shouldn't happen"); } context->oid_in_use.erase(oid); -- 2.39.5