]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: increase retry duration when calculating manifest ref. count 44202/head
authormyoungwon oh <ohmyoungwon@gmail.com>
Tue, 12 Oct 2021 03:09:22 +0000 (12:09 +0900)
committermyoungwon oh <ohmyoungwon@gmail.com>
Fri, 3 Dec 2021 13:12:46 +0000 (22:12 +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>
(cherry picked from 82bcf9b57fc4939677ef1af20a1a3fa258243a37)

src/test/librados/tier_cxx.cc

index b5032e9afb35c2d89c9ae8f402c163ced2d9f590..51e3b3aa9c71660bd86b995ba06091644b86511a 100644 (file)
@@ -179,7 +179,8 @@ void is_intended_refcount_state(librados::IoCtx& src_ioctx,
     }
     dst_refcount = refs.count();
   }
-  for (int tries = 0; tries < 10; ++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;
@@ -191,6 +192,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);