Merge pull request #4011 from ceph/wip-mds-damaged

mds: Add 'damaged' state and handle errors during rank startup

Reviewed-by: Greg Farnum <gfarnum@rehdat.com>

diff --cc src/common/config_opts.h
index 687e866cf93db24afe7fc0eef2adc1abc46f4e9b,43a3f20b0a16760e6bf0423fca4b2f425921d03f..f3634349871cc06dc3c780dcc9d53fd9d0a11dc4
--- 1/src/common/config_opts.h
--- 2/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)
  

diff --cc src/mds/MDS.cc
Simple merge