Merge PR #19369 into master

* refs/pull/19369/head:
	qa: update handling of fs status format
	PendingReleaseNotes: add note for format change
	mds/MDSMap : use arrary_section for mds stat

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Xiaoxi Chen <xiaoxchen@ebay.com>

diff --cc PendingReleaseNotes
index b48eb44cf70ba1cbc4adfe5be207e27253b34e2e,2f4e3db825c60b62ea92f3020c7960367a1c5033..f5b945d8df35cff0b4cad3908792f51790c25e8b
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -20,12 -20,8 +20,13 @@@
        - mds remove_data_pool -> fs rm_data_pool
        - mds rm_data_pool -> fs rm_data_pool
  
- 
 +  * New CephFS file system attributes session_timeout and session_autoclose
 +    are configurable via `ceph fs set`. The MDS config options
 +    mds_session_timeout, mds_session_autoclose, and mds_max_file_size are now
 +    obsolete.
 +
+   * The JSON format of `ceph fs status` and `ceph mds stat` has changed
+     for the "up" and "info" sections of the mds_map.
  
  >= 12.2.2
  ---------

diff --cc qa/tasks/cephfs/filesystem.py
Simple merge

diff --cc qa/tasks/cephfs/test_strays.py
Simple merge

diff --cc src/pybind/ceph_volume_client.py
index 9e4a2a21682dfdc84a322a532cfbe70f67192a78,a09c41da5ed9f51394bc693dc1923f1cf163afa4..ae6bb8327d166222b191ebb351e2883a4de88932
--- 1/src/pybind/ceph_volume_client.py
--- 2/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@@ -391,12 -398,10 +398,10 @@@ class CephFSVolumeClient(object)
  
          log.info("evict clients with {0}".format(', '.join(client_spec)))
  
 -        mds_map = get_mds_map()
 +        mds_map = self.get_mds_map()
          up = {}
-         for name, gid in mds_map['up'].items():
-             # Quirk of the MDSMap JSON dump: keys in the up dict are like "mds_0"
-             assert name.startswith("mds_")
-             up[int(name[4:])] = gid
+         for rank in mds_map['up']:
+             up[rank] = self._get_info('rank', rank)['gid']
  
          # For all MDS ranks held by a daemon
          # Do the parallelism in python instead of using "tell mds.*", because