Fixing Stress Test

Signed-off-by: Harsimran Singh <hsthukral51@gmail.com>
(cherry picked from commit 184cad26575cb73203d1073c82829040d6822d45)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Resolves: rhbz#2402146
Resolves: rhbz#2411930

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 96b19755c907f37383a53f73e22836d4b5044fd6..fbd62b65550a65d2766b27b332f0fb8553d704b8 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4160,9 +4160,6 @@ void RGWDeleteBucket::execute(optional_yield y)
   rgw::op_counters::inc(counters, l_rgw_op_del_bucket, 1);
   rgw::op_counters::tinc(counters, l_rgw_op_del_bucket_lat, s->time_elapsed());
 
-  rgw::op_counters::inc(counters, l_rgw_op_del_bucket, 1);
-  rgw::op_counters::tinc(counters, l_rgw_op_del_bucket_lat, s->time_elapsed());
-
   // Add usage counter update here, right before return
   if (op_ret >= 0) {
     auto* usage_counters = rgw::get_usage_perf_counters();

diff --git a/src/test/rgw/test_rgw_usage_cache.cc b/src/test/rgw/test_rgw_usage_cache.cc
index 0370aa3eb84e37ba592d04113fef92209cf39a53..eaaf8c23eb01c1c8987982f8f4343bfbb61a6acc 100644 (file)
--- a/src/test/rgw/test_rgw_usage_cache.cc
+++ b/src/test/rgw/test_rgw_usage_cache.cc
@@ -268,6 +268,23 @@ TEST_F(TestRGWUsageCache, StressTest) {
   const int num_users = 1000;
   const int num_buckets = 500;
   
+  // Create a new config with longer TTL for stress testing
+  rgw::UsageCache::Config stress_config;
+  stress_config.db_path = test_db_path;
+  stress_config.max_db_size = 1 << 20;
+  stress_config.max_readers = 10;
+  stress_config.ttl = std::chrono::seconds(1800);  // 30 minutes for stress test
+  
+  // Recreate cache with longer TTL
+  cache.reset();
+  
+  if (g_test_context) {
+    cache = std::make_unique<rgw::UsageCache>(g_test_context, stress_config);
+  } else {
+    cache = std::make_unique<rgw::UsageCache>(stress_config);
+  }
+  ASSERT_EQ(0, cache->init());
+
   // Add many users
   for (int i = 0; i < num_users; ++i) {
     std::string user_id = "stress_user_" + std::to_string(i);