]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Fix missing root path of each session for CephFS 39869/head
authorYongseok Oh <yongseok.oh@linecorp.com>
Fri, 7 Aug 2020 11:20:17 +0000 (20:20 +0900)
committerAvan Thakkar <athakkar@localhost.localdomain>
Mon, 8 Mar 2021 12:59:22 +0000 (18:29 +0530)
Signed-off-by: Yongseok Oh <yongseok.oh@linecorp.com>
(cherry picked from commit 7c3cadd09645575898a85d2b50b95808b334de69)

 Conflicts:
src/pybind/mgr/dashboard/controllers/cephfs.py
      - Adopting the master branch changes.

src/pybind/mgr/dashboard/controllers/cephfs.py

index 788a865a6fc56cdeac40ed00a6e016d23812eb53..86fc5d5ee45bc790e57ad32e7cfdfb9ade3e3989 100644 (file)
@@ -269,10 +269,12 @@ class CephFS(RESTController):
                 client['type'] = "userspace"
                 client['version'] = client['client_metadata']['ceph_version']
                 client['hostname'] = client['client_metadata']['hostname']
+                client['root'] = client['client_metadata']['root']
             elif "kernel_version" in client['client_metadata']:
                 client['type'] = "kernel"
                 client['version'] = client['client_metadata']['kernel_version']
                 client['hostname'] = client['client_metadata']['hostname']
+                client['root'] = client['client_metadata']['root']
             else:
                 client['type'] = "unknown"
                 client['version'] = ""