From: David Zafman <dzafman@redhat.com>
Date: Wed, 7 Nov 2018 22:05:55 +0000 (-0800)
Subject: Merge pull request #24749 from dzafman/wip-36474
X-Git-Tag: v14.1.0~985
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24982%2Fhead;p=ceph.git

Merge pull request #24749 from dzafman/wip-36474

Add support for osd_delete_sleep configuration value

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

02964703deea405058eab4fb4f345fcabf8bf530
diff --cc src/osd/OSD.h
index 4b6cf8edecd2,b54c36b758df..8195b1bab4fe
--- a/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,