From: David Zafman <dzafman@redhat.com>
Date: Tue, 9 Oct 2018 20:24:38 +0000 (-0700)
Subject: osd: New configuration option osd_delete_sleep
X-Git-Tag: v12.2.11~138^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e6d2a1b29d3f3679b423a772172ba632fdb7395;p=ceph.git

osd: New configuration option osd_delete_sleep

Causes the remove_wq thread to sleep the specified number
of seconds between transactions.

Fixes: http://tracker.ceph.com/issues/36321

Signed-off-by: David Zafman <dzafman@redhat.com>

This backport is not cherry-picked from master since the remove
threadpool was folded into the main op queue post-luminous, so the
code is almost entirely different.
---

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 8232fdc3d78..25780b32b3e 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -848,6 +848,7 @@ OPTION(osd_op_history_duration, OPT_U32) // Oldest completed op to track
 OPTION(osd_op_history_slow_op_size, OPT_U32)           // Max number of slow ops to track
 OPTION(osd_op_history_slow_op_threshold, OPT_DOUBLE) // track the op if over this threshold
 OPTION(osd_target_transaction_size, OPT_INT)     // to adjust various transactions that batch smaller items
+OPTION(osd_delete_sleep, OPT_FLOAT)         // seconds to sleep between removal transactions
 OPTION(osd_failsafe_full_ratio, OPT_FLOAT) // what % full makes an OSD "full" (failsafe)
 OPTION(osd_fast_fail_on_connection_refused, OPT_BOOL) // immediately mark OSDs as down once they refuse to accept connections
 
diff --git a/src/common/options.cc b/src/common/options.cc
index 970a12f3fe6..966cd1a4a18 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2846,6 +2846,10 @@ std::vector<Option> get_global_options() {
     .set_default(30)
     .set_description(""),
 
+    Option("osd_delete_sleep", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
+    .set_default(0)
+    .set_description("Time in seconds to sleep before next removal transaction"),
+
     Option("osd_failsafe_full_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(.97)
     .set_description(""),
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 75063ef84ae..40249005e3e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5702,6 +5702,12 @@ bool remove_dir(
       cont = dstate->pause_clearing();
       handle.suspend_tp_timeout();
       waiter.wait();
+      if (cct->_conf->osd_delete_sleep) {
+        utime_t t;
+        t.set_from_double(cct->_conf->osd_delete_sleep);
+        lgeneric_subdout(cct, osd, 10) << __func__ << " inject delay of " << t << dendl;
+        t.sleep();
+      }
       handle.reset_tp_timeout();
       if (cont)
         cont = dstate->resume_clearing();