From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 22 Aug 2020 01:39:01 +0000 (-0700)
Subject: Merge PR #36459 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~301
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=beb0d00c8dcfb29f89a50510312944c4e70f6cc7;p=ceph-ci.git

Merge PR #36459 into master

* refs/pull/36459/head:
	mds: dump granular cap info in mds_sessions
	common: fix validate type CephBool cause 'invalid command json'

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

beb0d00c8dcfb29f89a50510312944c4e70f6cc7
diff --cc src/client/Client.cc
index 500e085f59e,691f8357615..ee046af5fbc
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -154,12 -156,14 +156,14 @@@ int Client::CommandHook::call
  {
    f->open_object_section("result");
    {
 -    std::lock_guard l{m_client->client_lock};
 +    std::scoped_lock l{m_client->client_lock};
      if (command == "mds_requests")
        m_client->dump_mds_requests(f);
-     else if (command == "mds_sessions")
-       m_client->dump_mds_sessions(f);
-     else if (command == "dump_cache")
+     else if (command == "mds_sessions") {
+       bool cap_dump = false;
+       cmd_getval(cmdmap, "cap_dump", cap_dump);
+       m_client->dump_mds_sessions(f, cap_dump);
+     } else if (command == "dump_cache")
        m_client->dump_cache(f);
      else if (command == "kick_stale_sessions")
        m_client->_kick_stale_sessions();