From: Pritha Srivastava <prsrivas@redhat.com>
Date: Mon, 14 Oct 2019 04:09:03 +0000 (+0530)
Subject: Correcting the value of rgw_gc_max_queue_size.
X-Git-Tag: v15.1.0~1185^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eca03c4501ec577edb72bf7d735d84788715e3ed;p=ceph-ci.git

Correcting the value of rgw_gc_max_queue_size.
queue head size must be subtracted from osd_max_object_size
to get rgw_gc_max_queue_size.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 2612e6b1917..e747a00b764 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6467,12 +6467,12 @@ std::vector<Option> get_rgw_options() {
     .set_description("maximum allowed size of deferred entries in queue head for gc"),
 
     Option("rgw_gc_max_queue_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(128_M)
+    .set_default(134213632)
     .set_description("Maximum allowed queue size for gc")
     .set_long_description(
         "The maximum allowed size of each gc queue, and its value should not "
-        "be greater than osd_max_object_size.")
-    .add_see_also({"osd_max_object_size"}),
+        "be greater than (osd_max_object_size - rgw_gc_max_deferred_entries_size - 1K).")
+    .add_see_also({"osd_max_object_size", "rgw_gc_max_deferred_entries_size"}),
 
     Option("rgw_gc_max_deferred", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(50)