Merge pull request #24749 from dzafman/wip-36474

Add support for osd_delete_sleep configuration value

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/common/options.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
index 4b6cf8edecd279a4810ca9dc64dce172972c631a,b54c36b758df7a03ffe1e43f3035989b57703d7f..8195b1bab4fe1d67e35b7e94b02596bbb3aa0b69
--- 1/src/osd/OSD.h
--- 2/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -2286,8 -2287,10 +2286,9 @@@ private
    int get_num_op_threads();
  
    float get_osd_recovery_sleep();
+   float get_osd_delete_sleep();
  
    void probe_smart(const string& devid, ostream& ss);
 -  int probe_smart_device(const char *device, int timeout, std::string *result);
  
  public:
    static int peek_meta(ObjectStore *store, string& magic,

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge