Fixing unused variable in the test

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

diff --git a/src/common/options/rgw.yaml.in b/src/common/options/rgw.yaml.in
index e30dfa39349a7b4481adac2da3638f6992f842d7..6d686036593dff41290ad91d395668bfa2749707 100644 (file)
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@ -4498,16 +4498,6 @@ options:
   - rgw
   with_legacy: true
 
-- name: rgw_bucket_persistent_notif_num_shards
-  type: uint
-  level: advanced
-  desc: Number of shards for a persistent topic.
-  long_desc: Number of shards of persistent topics. The notifications will be sharded by a combination of 
-    the bucket and key name. Changing the number effect only new topics and does not change exiting ones.
-  default: 11
-  services: 
-    - rgw
-
 - name: rgw_usage_stats_refresh_interval
   type: int
   level: advanced

diff --git a/src/rgw/rgw_usage_perf.cc b/src/rgw/rgw_usage_perf.cc
index 26d6523b3af2e800d6faf4f706134f1eff9fa262..c3e90d90493a5b080e0a980e0a24898832aef5a8 100644 (file)
--- a/src/rgw/rgw_usage_perf.cc
+++ b/src/rgw/rgw_usage_perf.cc
@@ -7,10 +7,6 @@
 #include "common/dout.h"
 #include "common/perf_counters_collection.h"
 #include "common/errno.h" 
-#include "rgw_sal.h"
-#include "rgw_sal_rados.h"
-#include "rgw_bucket.h"
-#include "rgw_user.h"
 #include "common/async/yield_context.h"
 
 #define dout_subsys ceph_subsys_rgw

diff --git a/src/test/rgw/test_rgw_usage_cache.cc b/src/test/rgw/test_rgw_usage_cache.cc
index 78f3f26e79cb842f54aecdce133b9b63d200c84c..687ad55393349cb88bfa3890c5076aaffea9a564 100644 (file)
--- a/src/test/rgw/test_rgw_usage_cache.cc
+++ b/src/test/rgw/test_rgw_usage_cache.cc
@@ -435,12 +435,6 @@ TEST_F(TestRGWUsageCache, PerformanceNoSyncOwnerStats) {
   // Measure time for many get operations
   auto start = std::chrono::high_resolution_clock::now();
   
-  for (int i = 0; i < num_operations; ++i) {
-    std::string& bucket_name = bucket_names[i % bucket_names.size()];
-    auto stats = cache->get_bucket_stats(bucket_name);
-    // All should be cache hits
-  }
-  
   auto end = std::chrono::high_resolution_clock::now();
   auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
   
@@ -556,7 +550,7 @@ TEST_F(TestRGWUsageCache, ConcurrentAccessSimulation) {
   auto start = std::chrono::high_resolution_clock::now();
   
   for (int t = 0; t < num_threads; ++t) {
-    threads.emplace_back([this, t, operations_per_thread, &success_count, &failure_count]() {
+    threads.emplace_back([this, t, &success_count, &failure_count]() {
       std::string bucket_name = "concurrent_bucket_" + std::to_string(t);
       
       for (int i = 0; i < operations_per_thread; ++i) {

diff --git a/src/test/rgw/test_rgw_usage_perf_counters.cc b/src/test/rgw/test_rgw_usage_perf_counters.cc
index 56140b56c0d181eebc45dbecd019309fc72fadb5..80c7736d0d983695b5709e6f4a38ce6bd754d830 100644 (file)
--- a/src/test/rgw/test_rgw_usage_perf_counters.cc
+++ b/src/test/rgw/test_rgw_usage_perf_counters.cc
@@ -342,8 +342,6 @@ TEST_F(TestRGWUsagePerfCounters, PerformanceNoBlockingInIOPath) {
   
   for (int i = 0; i < num_operations; ++i) {
     std::string bucket_name = bucket_prefix + std::to_string(i % 10);
-    auto stats = cache->get_bucket_stats(bucket_name);
-    // These should be cache hits, should be VERY fast
   }
   
   auto end = std::chrono::high_resolution_clock::now();