From: myoungwon oh <ohmyoungwon@gmail.com>
Date: Mon, 8 Mar 2021 12:04:35 +0000 (+0900)
Subject: src/test: generate useful log regarding ENOENT
X-Git-Tag: v17.1.0~2307^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6caa92d5d1928aad51c0afa3a4c0f40aa93d8a6f;p=ceph.git

src/test: generate useful log regarding ENOENT

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

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index e0510e8a2c96..63d93622a30c 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);