From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 12 Dec 2019 16:41:43 +0000 (-0800)
Subject: Merge pull request #31857 from smithfarm/wip-40947-luminous
X-Git-Tag: v12.2.13~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af44984f8284e07aafe881f06a1827d9e2e2f30c;p=ceph.git

Merge pull request #31857 from smithfarm/wip-40947-luminous

luminous:  osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

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

af44984f8284e07aafe881f06a1827d9e2e2f30c
diff --cc src/osd/OSD.h
index 52a281bc368,1b91b0da108..ddaab9279a9
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -2500,14 -2498,11 +2500,15 @@@ private
    int get_num_op_threads();
  
    float get_osd_recovery_sleep();
+   float get_osd_snap_trim_sleep();
  
  public:
 -  static int peek_meta(ObjectStore *store, string& magic,
 -		       uuid_d& cluster_fsid, uuid_d& osd_fsid, int& whoami);
 +  static int peek_meta(ObjectStore *store,
 +		       string *magic,
 +		       uuid_d *cluster_fsid,
 +		       uuid_d *osd_fsid,
 +		       int *whoami,
 +		       int *min_osd_release);
    
  
    // startup/shutdown