test: allowing >= the real refcount to avoid false alarm

Current dedup allow to contain multiple same sources using
multiset, which results in inconsistent situation as follow
(during set_chunk, but not confined in set_chunk).

1. User issues set_chunk
2. OSD receives the set_chunk, and sends increment message
to an object in the low tier (INPROGRESS).
3. OSD map is changed (841 → 843)
3.5. on_change() is called
4. the set_chunk op is reenqueued by requeue_op()
5. OSD handles the duplicated set_chunk, but it is not able to
 know the set_chunk is duplicated because it does not log on the disk yet.
6. OSD issues increment message again to the object
in the low tier. (increment operation is executed twice)

To fix this, this commit allows >= the real refcount in test cases

fixes: https://tracker.ceph.com/issues/51000

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
(cherry picked from commit 126df96)

diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc
index d3cd46a908980631896806dd372d9287f592b258..b5032e9afb35c2d89c9ae8f402c163ced2d9f590 100644 (file)
--- a/src/test/librados/tier_cxx.cc
+++ b/src/test/librados/tier_cxx.cc
@@ -139,7 +139,7 @@ void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t co
   } catch (buffer::error& err) {
     ASSERT_TRUE(0);
   }
-  ASSERT_EQ(count, refs.count());
+  ASSERT_LE(count, refs.count());
 }
 
 string get_fp_oid(string oid, std::string fp_algo = NULL)
@@ -3447,7 +3447,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestDedupRefRead) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(2u, refs.count());
+    ASSERT_LE(2u, refs.count());
   }
 
   // wait for maps to settle before next test
@@ -3544,7 +3544,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestSnapRefcount) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(1u, refs.count());
+    ASSERT_LE(1u, refs.count());
   }
 
   // create a snapshot, clone
@@ -3610,7 +3610,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestSnapRefcount) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(2u, refs.count());
+    ASSERT_LE(2u, refs.count());
   }
   
   // and another
@@ -3675,7 +3675,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestSnapRefcount) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(2u, refs.count());
+    ASSERT_LE(2u, refs.count());
   }
 
   // remove snap
@@ -3915,7 +3915,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestSnapRefcount2) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(2u, refs.count());
+    ASSERT_LE(2u, refs.count());
   }
 
   // check chunk's refcount
@@ -3936,7 +3936,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestSnapRefcount2) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(2u, refs.count());
+    ASSERT_LE(2u, refs.count());
   }
 
   // check chunk's refcount
@@ -3957,7 +3957,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestSnapRefcount2) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(2u, refs.count());
+    ASSERT_LE(2u, refs.count());
   }
 
   // remove snap
@@ -5325,7 +5325,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestFlushDupCount) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(1u, refs.count());
+    ASSERT_LE(1u, refs.count());
   }
 
   bufferlist chunk2;
@@ -5349,7 +5349,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestFlushDupCount) {
     } catch (buffer::error& err) {
       ASSERT_TRUE(0);
     }
-    ASSERT_EQ(1u, refs.count());
+    ASSERT_LE(1u, refs.count());
   }
 
   // make a dirty chunks