]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: increase retry duration when calculating manifest ref. count 43493/head
authormyoungwon oh <ohmyoungwon@gmail.com>
Tue, 12 Oct 2021 03:09:22 +0000 (12:09 +0900)
committermyoungwon oh <ohmyoungwon@gmail.com>
Wed, 13 Oct 2021 01:44:48 +0000 (10:44 +0900)
In situation where the object is degraded and delayed,
retry time can expire before the object is recovered
---it takes almost 6 minutes to be recovered according to
the log.

Fixes: https://tracker.ceph.com/issues/52872
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
src/test/librados/tier_cxx.cc

index 4239084b6c7143152004fedb642a0a557de9e954..287c6fa2ae6ac5d396296b83f7ab3d671d1e1456 100644 (file)
@@ -177,7 +177,8 @@ void is_intended_refcount_state(librados::IoCtx& src_ioctx,
     }
     dst_refcount = refs.count();
   }
-  for (int tries = 0; tries < 15; ++tries) {
+  int tries = 0;
+  for (; tries < 30; ++tries) {
     r = cls_cas_references_chunk(src_ioctx, src_oid, dst_oid);
     if (r == -ENOENT || r == -ENOLINK) {
       src_refcount = 0;
@@ -189,6 +190,7 @@ void is_intended_refcount_state(librados::IoCtx& src_ioctx,
     }
     break;
   }
+  ASSERT_TRUE(tries < 30);
   ASSERT_TRUE(src_refcount >= 0);
   ASSERT_TRUE(src_refcount == expected_refcount);
   ASSERT_TRUE(src_refcount <= dst_refcount);