test/rgw: RGWReshardWait uses std::chrono::steady_clock

the synchronous wait() call uses std::condition_variable::wait_for(),
which is based on std::chrono::steady_clock. this changes the asynchronous
waits (along with timing in the unit test) to use that same clock

should resolve this test failure:

[ RUN      ] ReshardWait.wait_yield
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rgw/test_rgw_reshard_wait.cc:78:
Failure
Expected: (wait_duration) <= (elapsed), actual: 0.01s vs 0.00835688s
[  FAILED  ] ReshardWait.wait_yield (8 ms)

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
index d27fe7e079b3171d0a83f4e6d8dac5f331beb9f9..d99a6ff68d5fcb438de4aed7dca7a1eff064606b 100644 (file)
--- a/src/rgw/rgw_reshard.h
+++ b/src/rgw/rgw_reshard.h
@@ -173,11 +173,15 @@ public:
 };
 
 class RGWReshardWait {
+ public:
+  // the blocking wait uses std::condition_variable::wait_for(), which uses the
+  // std::chrono::steady_clock. use that for the async waits as well
+  using Clock = std::chrono::steady_clock;
+ private:
   const ceph::timespan duration;
   ceph::mutex mutex = ceph::make_mutex("RGWReshardWait::lock");
   ceph::condition_variable cond;
 
-  using Clock = ceph::coarse_real_clock;
   struct Waiter : boost::intrusive::list_base_hook<> {
     boost::asio::basic_waitable_timer<Clock> timer;
     explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}

diff --git a/src/test/rgw/test_rgw_reshard_wait.cc b/src/test/rgw/test_rgw_reshard_wait.cc
index e951bc1acb16b611cc443ad67986ec10aad4a2d3..e63f066d08a302aff94daaae79770a1e6239be7c 100644 (file)
--- a/src/test/rgw/test_rgw_reshard_wait.cc
+++ b/src/test/rgw/test_rgw_reshard_wait.cc
@@ -17,15 +17,16 @@
 #include <gtest/gtest.h>
 
 using namespace std::chrono_literals;
+using Clock = RGWReshardWait::Clock;
 
 TEST(ReshardWait, wait_block)
 {
   constexpr ceph::timespan wait_duration = 10ms;
   RGWReshardWait waiter(wait_duration);
 
-  const ceph::real_time start = ceph::real_clock::now();
+  const auto start = Clock::now();
   EXPECT_EQ(0, waiter.wait(null_yield));
-  const ceph::timespan elapsed = ceph::real_clock::now() - start;
+  const ceph::timespan elapsed = Clock::now() - start;
 
   EXPECT_LE(wait_duration, elapsed); // waited at least 10ms
   waiter.stop();
@@ -39,7 +40,7 @@ TEST(ReshardWait, stop_block)
   RGWReshardWait long_waiter(long_duration);
   RGWReshardWait short_waiter(short_duration);
 
-  const ceph::real_time start = ceph::real_clock::now();
+  const auto start = Clock::now();
   std::thread thread([&long_waiter] {
     EXPECT_EQ(-ECANCELED, long_waiter.wait(null_yield));
   });
@@ -49,7 +50,7 @@ TEST(ReshardWait, stop_block)
   long_waiter.stop(); // cancel long waiter
 
   thread.join();
-  const ceph::timespan elapsed = ceph::real_clock::now() - start;
+  const ceph::timespan elapsed = Clock::now() - start;
 
   EXPECT_LE(short_duration, elapsed); // waited at least 10ms
   EXPECT_GT(long_duration, elapsed); // waited less than 10s
@@ -67,13 +68,13 @@ TEST(ReshardWait, wait_yield)
       EXPECT_EQ(0, waiter.wait(optional_yield{context, yield}));
     });
 
-  const ceph::real_time start = ceph::real_clock::now();
+  const auto start = Clock::now();
   EXPECT_EQ(1u, context.poll()); // spawn
   EXPECT_FALSE(context.stopped());
 
   EXPECT_EQ(1u, context.run_one()); // timeout
   EXPECT_TRUE(context.stopped());
-  const ceph::timespan elapsed = ceph::real_clock::now() - start;
+  const ceph::timespan elapsed = Clock::now() - start;
 
   EXPECT_LE(wait_duration, elapsed); // waited at least 10ms
   waiter.stop();
@@ -93,17 +94,17 @@ TEST(ReshardWait, stop_yield)
       EXPECT_EQ(-ECANCELED, long_waiter.wait(optional_yield{context, yield}));
     });
 
+  const auto start = Clock::now();
   EXPECT_EQ(1u, context.poll()); // spawn
   EXPECT_FALSE(context.stopped());
 
-  const ceph::real_time start = ceph::real_clock::now();
   EXPECT_EQ(0, short_waiter.wait(null_yield));
 
   long_waiter.stop(); // cancel long waiter
 
   EXPECT_EQ(1u, context.run_one_for(short_duration)); // timeout
   EXPECT_TRUE(context.stopped());
-  const ceph::timespan elapsed = ceph::real_clock::now() - start;
+  const ceph::timespan elapsed = Clock::now() - start;
 
   EXPECT_LE(short_duration, elapsed); // waited at least 10ms
   EXPECT_GT(long_duration, elapsed); // waited less than 10s
@@ -140,10 +141,11 @@ TEST(ReshardWait, stop_multiple)
     boost::asio::spawn(context, async_waiter);
     boost::asio::spawn(context, async_waiter);
   }
+
+  const auto start = Clock::now();
   EXPECT_EQ(4u, context.poll()); // spawn
   EXPECT_FALSE(context.stopped());
 
-  const ceph::real_time start = ceph::real_clock::now();
   EXPECT_EQ(0, short_waiter.wait(null_yield));
 
   long_waiter.stop(); // cancel long waiter
@@ -154,7 +156,7 @@ TEST(ReshardWait, stop_multiple)
   for (auto& thread : threads) {
     thread.join();
   }
-  const ceph::timespan elapsed = ceph::real_clock::now() - start;
+  const ceph::timespan elapsed = Clock::now() - start;
 
   EXPECT_LE(short_duration, elapsed); // waited at least 10ms
   EXPECT_GT(long_duration, elapsed); // waited less than 10s