Merge PR #18274 into master

* refs/pull/18274/head:
	mds: fold mds_revoke_cap_timeout into mds_session_timeout
	client: add new delegation testcases
	client: add delegation support for cephfs
	common: remove data_dir_option from common_preinit and global_pre_init

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/common/common_init.cc
Simple merge

diff --cc src/common/legacy_config_opts.h
index f880ef81827138b0a80e71fe02d361ff7ec21ba0,c00681b475ea492aaa2e3395e4ea194820179827..3476122f431f8064d8433281458ad459a031d888
--- 1/src/common/legacy_config_opts.h
--- 2/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@@ -422,8 -433,9 +422,8 @@@ OPTION(mds_decay_halflife, OPT_FLOAT
  OPTION(mds_beacon_interval, OPT_FLOAT)
  OPTION(mds_beacon_grace, OPT_FLOAT)
  OPTION(mds_enforce_unique_name, OPT_BOOL)
 -OPTION(mds_blacklist_interval, OPT_FLOAT)  // how long to blacklist failed nodes
  
- OPTION(mds_session_timeout, OPT_FLOAT)    // cap bits and leases time out if client idle
+ OPTION(mds_session_timeout, OPT_FLOAT)    // cap bits and leases time out if client unresponsive or not returning its caps
  OPTION(mds_session_blacklist_on_timeout, OPT_BOOL)    // whether to blacklist clients whose sessions are dropped due to timeout
  OPTION(mds_session_blacklist_on_evict, OPT_BOOL)  // whether to blacklist clients whose sessions are dropped via admin commands
  

diff --cc src/common/options.cc
Simple merge

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

diff --cc src/mds/MDSMap.h
Simple merge