Merge PR #38773 into master

* refs/pull/38773/head: mds: avoid spurious sleeps Reviewed-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: Rishabh Dave <ridave@redhat.com> Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
ceph · Jan 8, 2021 · 8880029 · 8880029
2 parents fe72434 + eb47e99
commit 8880029
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -6535,7 +6535,7 @@ void Client::start_tick_thread()
       auto d_interval = clock::duration(cct->_conf.get_val<sec>("client_debug_inject_tick_delay"));
 
       auto interval = std::max(t_interval, d_interval);
-      if (likely(since >= interval)) {
+      if (likely(since >= interval*.90)) {
         tick();
         last_tick = clock::now();
       } else {

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
@@ -190,7 +190,7 @@ MDCache::MDCache(MDSRank *m, PurgeQueue &purge_queue_) :
       }
       since = now-upkeep_last_release;
       auto release_interval = clock::duration(g_conf().get_val<std::chrono::seconds>("mds_cache_release_free_interval"));
-      if (since >= release_interval) {
+      if (since >= release_interval*.90) {
         /* XXX not necessary once MDCache uses PriorityCache */
         dout(10) << "releasing free memory" << dendl;
         ceph_heap_release_free_memory();