From: Gregory Farnum Date: Mon, 23 Mar 2015 18:21:23 +0000 (-0700) Subject: Merge pull request #4011 from ceph/wip-mds-damaged X-Git-Tag: v9.0.0~113 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd0f46fa67ba3e4c691016dfaba53e909c194683;p=ceph.git Merge pull request #4011 from ceph/wip-mds-damaged mds: Add 'damaged' state and handle errors during rank startup Reviewed-by: Greg Farnum --- dd0f46fa67ba3e4c691016dfaba53e909c194683 diff --cc src/common/config_opts.h index 687e866cf93d,43a3f20b0a16..f3634349871c --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@@ -452,14 -449,8 +452,15 @@@ OPTION(mds_snap_rstat, OPT_BOOL, false OPTION(mds_verify_backtrace, OPT_U32, 1) OPTION(mds_action_on_write_error, OPT_U32, 1) // 0: ignore; 1: force readonly; 2: crash + OPTION(mds_mon_shutdown_timeout, OPT_DOUBLE, 5) +// Maximum number of concurrent stray files to purge +OPTION(mds_max_purge_files, OPT_U32, 64) +// Maximum number of concurrent RADOS ops to issue in purging +OPTION(mds_max_purge_ops, OPT_U32, 8192) +// Maximum number of concurrent RADOS ops to issue in purging, scaled by PG count +OPTION(mds_max_purge_ops_per_pg, OPT_FLOAT, 0.5) + // If true, compact leveldb store on mount OPTION(osd_compact_leveldb_on_mount, OPT_BOOL, false)