]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cls/2pc_queue: fix timing issue in test 35023/head
authorYuval Lifshitz <ylifshit@redhat.com>
Tue, 12 May 2020 14:19:40 +0000 (17:19 +0300)
committerYuval Lifshitz <ylifshit@redhat.com>
Tue, 12 May 2020 14:19:40 +0000 (17:19 +0300)
Fixes: https://tracker.ceph.com/issues/45513
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
src/test/cls_2pc_queue/test_cls_2pc_queue.cc

index 9b325b258d079b9324529d985d533d7456add7ea..f66fcc773234e4f008efd3b547859f2307511bb9 100644 (file)
@@ -505,7 +505,7 @@ TEST_F(TestCls2PCQueue, Cleanup)
       }
     });
   }
+
   auto cleaned_reservations = 0U;
   auto committed_reservations = 0U;
   auto aborter = std::thread([this, &queue_name, &stale_time, &cleaned_reservations, &committed_reservations] {
@@ -544,7 +544,7 @@ TEST_F(TestCls2PCQueue, Cleanup)
   aborter.join();
 
   ASSERT_GT(cleaned_reservations, 0);
-  ASSERT_GT(committed_reservations, 0);
+  ASSERT_EQ(committed_reservations + cleaned_reservations, number_of_ops*max_workers);
   cls_2pc_reservations reservations;
   ASSERT_EQ(0, cls_2pc_queue_list_reservations(ioctx, queue_name, reservations));
   ASSERT_EQ(reservations.size(), 0);