From: Samuel Just Date: Fri, 2 May 2014 23:48:10 +0000 (-0700) Subject: Merge pull request #1694 from ceph/wip-throttle-snap-master X-Git-Tag: v0.81~80 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2700ebf83b06309dc22ecb5a54abf1e3a75ca832;p=ceph.git Merge pull request #1694 from ceph/wip-throttle-snap-master osd: throttle snap trimmming with simple delay Reviewed-by: Samuel Just --- 2700ebf83b06309dc22ecb5a54abf1e3a75ca832 diff --cc src/common/config_opts.h index 2d2f360a1602,2490244b0c07..be2612868221 --- a/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)