From: Sage Weil Date: Mon, 3 Dec 2012 11:56:15 +0000 (-0800) Subject: config: we still want osd_thread_recovery_timeout X-Git-Tag: v0.56~123 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bea57bfd0e4e3341da46b7139eff0b629eca332;p=ceph.git config: we still want osd_thread_recovery_timeout Signed-off-by: Sage Weil --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index e756bfcff3ce..0cdb16c3ebf7 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -310,6 +310,7 @@ OPTION(osd_recover_clone_overlap, OPT_BOOL, true) // preserve clone_overlap du OPTION(osd_backfill_scan_min, OPT_INT, 64) OPTION(osd_backfill_scan_max, OPT_INT, 512) OPTION(osd_op_thread_timeout, OPT_INT, 30) +OPTION(osd_recovery_thread_timeout, OPT_INT, 30) OPTION(osd_snap_trim_thread_timeout, OPT_INT, 60*60*1) OPTION(osd_scrub_thread_timeout, OPT_INT, 60) OPTION(osd_scrub_finalize_thread_timeout, OPT_INT, 60*10) @@ -452,6 +453,7 @@ OPTION(rgw_op_thread_timeout, OPT_INT, 10*60) OPTION(rgw_op_thread_suicide_timeout, OPT_INT, 0) OPTION(rgw_thread_pool_size, OPT_INT, 100) OPTION(rgw_num_control_oids, OPT_INT, 8) + OPTION(rgw_cluster_root_pool, OPT_STR, ".rgw.root") OPTION(rgw_log_nonexistent_bucket, OPT_BOOL, false) OPTION(rgw_log_object_name, OPT_STR, "%Y-%m-%d-%H-%i-%n") // man date to see codes (a subset are supported)