From d6a9eaad4ee3bcaf9c145bd8a0cb8cd9c6996674 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 26 Feb 2024 09:38:52 -0500 Subject: [PATCH] test/rgw: increase timeouts in unittest_rgw_dmclock_scheduler 1ms sleeps are generally below the timer's resolution. increase run_for() durations to 50ms to make the tests far less sensitive to timing. in practice, none of the sleeps actually wait the full 50ms Fixes: https://tracker.ceph.com/issues/64568 Signed-off-by: Casey Bodley (cherry picked from commit b4f3ddfe4385c12baa0f44fff9d2708c445625d3) --- src/test/rgw/test_rgw_dmclock_scheduler.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc index 36652d22f0382..c9b4a853fd4d7 100644 --- a/src/test/rgw/test_rgw_dmclock_scheduler.cc +++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc @@ -105,7 +105,7 @@ TEST(Queue, RateLimit) EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen)); EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen)); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -163,7 +163,7 @@ TEST(Queue, AsyncRequest) EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen)); EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen)); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -217,7 +217,7 @@ TEST(Queue, Cancel) EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -265,7 +265,7 @@ TEST(Queue, CancelClient) EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -315,7 +315,7 @@ TEST(Queue, CancelOnDestructor) EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); ASSERT_TRUE(ec1); @@ -369,20 +369,20 @@ TEST(Queue, CrossExecutorRequest) EXPECT_EQ(1u, counters(client_id::admin)->get(queue_counters::l_qlen)); EXPECT_EQ(1u, counters(client_id::auth)->get(queue_counters::l_qlen)); - callback_context.run_for(std::chrono::milliseconds(1)); + callback_context.poll(); // maintains work on callback executor while in queue EXPECT_FALSE(callback_context.stopped()); EXPECT_FALSE(ec1); EXPECT_FALSE(ec2); - queue_context.run_for(std::chrono::milliseconds(1)); + queue_context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(queue_context.stopped()); EXPECT_FALSE(ec1); // no callbacks until callback executor runs EXPECT_FALSE(ec2); - callback_context.run_for(std::chrono::milliseconds(1)); + callback_context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(callback_context.stopped()); ASSERT_TRUE(ec1); @@ -421,7 +421,7 @@ TEST(Queue, SpawnAsyncRequest) EXPECT_EQ(PhaseType::priority, p2); }); - context.run_for(std::chrono::milliseconds(1)); + context.run_for(std::chrono::milliseconds(50)); EXPECT_TRUE(context.stopped()); } -- 2.39.5