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>

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

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

diff --cc src/osd/OSD.h
index 52a281bc368a3bc7a2ed47fa6d5922532de19aad,1b91b0da108f52a1af6d78aa42e0b031d515b84c..ddaab9279a9e29b377aef73ac165c00a7d103610
--- 1/src/osd/OSD.h
--- 2/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