From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 14 Sep 2017 03:08:51 +0000 (-0700)
Subject: Merge PR #17657 into master
X-Git-Tag: v13.0.1~926
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d929dae49bddf59084951d66a573763d117f4941;p=ceph.git

Merge PR #17657 into master

* refs/remotes/upstream/pull/17657/head:
	mds: optimize MDCache::rejoin_scour_survivor_replicas()
	mds: fix MDSCacheObject::clear_replica_map
	mds: support limiting cache by memory
	common: refactor of lru
	mds: resolve unsigned coercion compiler warning
	common: use safer uint64_t for list size
	common: add bytes2str pretty print function
	mds: check if waiting is allocated before use
	mds: go back to compact_map for replicas
	mds: use mempool for cache objects
	mds: cleanup replica_map access
	common: add alloc_ptr smart pointer
	common: add warning on base class use of mempool
	common: use atomic uin64_t for counter

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

d929dae49bddf59084951d66a573763d117f4941
diff --cc src/mds/MDSRank.cc
index b4e196b5dde,5b0d76d82cf..77f1819788f
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@@ -1937,8 -1937,13 +1937,14 @@@ bool MDSRankDispatcher::handle_asok_com
  
      if (r != 0) {
        ss << "Failed to dump cache: " << cpp_strerror(r);
 +      f->reset();
      }
+   } else if (command == "cache status") {
+     Mutex::Locker l(mds_lock);
+     int r = mdcache->cache_status(f);
+     if (r != 0) {
+       ss << "Failed to get cache status: " << cpp_strerror(r);
+     }
    } else if (command == "dump tree") {
      string root;
      int64_t depth;