Merge pull request #1694 from ceph/wip-throttle-snap-master

osd: throttle snap trimmming with simple delay

Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/common/config_opts.h
index 2d2f360a16029c0903fd8fe0d641ec76b896ece3,2490244b0c072b886e201f446c1c89e6bd1125e3..be2612868221cc5f15597d248c5e7b3c8ec8f354
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -468,9 -469,9 +468,10 @@@ OPTION(osd_backfill_scan_max, OPT_INT, 
  OPTION(osd_op_thread_timeout, OPT_INT, 15)
  OPTION(osd_recovery_thread_timeout, OPT_INT, 30)
  OPTION(osd_snap_trim_thread_timeout, OPT_INT, 60*60*1)
+ OPTION(osd_snap_trim_sleep, OPT_FLOAT, 0)
  OPTION(osd_scrub_thread_timeout, OPT_INT, 60)
  OPTION(osd_scrub_finalize_thread_timeout, OPT_INT, 60*10)
 +OPTION(osd_scrub_invalid_stats, OPT_BOOL, true)
  OPTION(osd_remove_thread_timeout, OPT_INT, 60*60)
  OPTION(osd_command_thread_timeout, OPT_INT, 10*60)
  OPTION(osd_age, OPT_FLOAT, .8)

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