mds: switch to use heartbeat_reset_grace instead of hard code

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 8496730f4854a172498ad918de12198fc7e443d8)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index b87121914d44bcac979e81c18d8a9341bab76308..5dac4654e382185da4b6bbcc8cdcb8b22b4d17e7 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3776,13 +3776,13 @@ void MDCache::trim_unlinked_inodes()
       q.push_back(in);
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
   for (auto& in : q) {
     remove_inode_recursive(in);
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 }
@@ -5426,7 +5426,7 @@ bool MDCache::process_imported_caps()
     } else {
       open_ino(p.first, (int64_t)-1, fin, false);
     }
-    if (!(cap_imports_num_opening % 1000))
+    if (!(cap_imports_num_opening % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 
@@ -5610,7 +5610,7 @@ void MDCache::choose_lock_states_and_reconnect_caps()
       rejoin_pending_snaprealms.insert(in);
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 }
@@ -5779,7 +5779,7 @@ void MDCache::export_remaining_imported_caps()
       }
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 
@@ -6235,7 +6235,7 @@ void MDCache::reissue_all_caps()
        n += mds->locker->issue_caps(in);
     }
 
-    if ((count % 1000) + n >= 1000)
+    if ((count % mds->heartbeat_reset_grace()) + n >= mds->heartbeat_reset_grace())
       mds->heartbeat_reset();
     count += n;
   }
@@ -6356,7 +6356,7 @@ void MDCache::identify_files_to_recover()
       rejoin_check_q.push_back(in);
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 }
@@ -6368,13 +6368,13 @@ void MDCache::start_files_to_recover()
     if (in->filelock.get_state() == LOCK_XLOCKSNAP)
       mds->locker->issue_caps(in);
     mds->locker->check_inode_max_size(in);
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
   rejoin_check_q.clear();
   for (CInode *in : rejoin_recover_q) {
     mds->locker->file_recover(&in->filelock);
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
   if (!rejoin_recover_q.empty()) {
@@ -12295,7 +12295,7 @@ void MDCache::force_readonly()
     CInode *in = p.second;
     if (in->is_head())
       mds->locker->eval(in, CEPH_CAP_LOCKS);
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 

diff --git a/src/mds/OpenFileTable.cc b/src/mds/OpenFileTable.cc
index d3b0a33bbb56762f57a1dea65d5e668f761ee9d3..aa65a27d5675f2e12581e5b187ec960f8a09d7d8 100644 (file)
--- a/src/mds/OpenFileTable.cc
+++ b/src/mds/OpenFileTable.cc
@@ -1087,7 +1087,7 @@ void OpenFileTable::_prefetch_dirfrags()
       ceph_assert(dir->get_inode()->dirfragtree.is_leaf(dir->get_frag()));
     dir->fetch(gather.new_sub());
 
-    if (!(++num_opening_dirfrags % 1000))
+    if (!(++num_opening_dirfrags % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 
@@ -1161,7 +1161,7 @@ void OpenFileTable::_prefetch_inodes()
       mdcache->open_ino(ino, pool, fin, false);
     }
 
-    if (!(num_opening_inodes % 1000))
+    if (!(num_opening_inodes % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index ae64a4232a4940ca29fbd5646a9acb4b34b95570..09c39d15d81173f64c557d09094bd03202f2c442 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1355,7 +1355,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
        in->state_clear(CInode::STATE_AUTH);
       ceph_assert(g_conf()->mds_kill_journal_replay_at != 2);
 
-      if (!(++count % 1000))
+      if (!(++count % mds->heartbeat_reset_grace()))
         mds->heartbeat_reset();
     }
 
@@ -1390,7 +1390,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       if (lump.is_importing())
        dn->state_set(CDentry::STATE_AUTH);
 
-      if (!(++count % 1000))
+      if (!(++count % mds->heartbeat_reset_grace()))
         mds->heartbeat_reset();
     }
 
@@ -1428,7 +1428,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       // Make null dentries the first things we trim
       dout(10) << "EMetaBlob.replay pushing to bottom of lru " << *dn << dendl;
 
-      if (!(++count % 1000))
+      if (!(++count % mds->heartbeat_reset_grace()))
         mds->heartbeat_reset();
     }
   }
@@ -1461,7 +1461,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
          else
            dir->state_set(CDir::STATE_AUTH);
 
-          if (!(++count % 1000))
+          if (!(++count % mds->heartbeat_reset_grace()))
             mds->heartbeat_reset();
        }
       }
@@ -1493,7 +1493,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
        dir->state_clear(CDir::STATE_AUTH);
        mds->mdcache->adjust_subtree_auth(dir, CDIR_AUTH_UNDEF);
 
-        if (!(++count % 1000))
+        if (!(++count % mds->heartbeat_reset_grace()))
           mds->heartbeat_reset();
       }
     }
@@ -1506,7 +1506,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       ceph_assert(p->first->is_dir());
       mds->mdcache->adjust_subtree_after_rename(p->first, p->second, false);
 
-      if (!(++count % 1000))
+      if (!(++count % mds->heartbeat_reset_grace()))
         mds->heartbeat_reset();
     }
   }
@@ -1524,7 +1524,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       } else
        mds->mdcache->remove_inode_recursive(in);
 
-      if (!(++count % 1000))
+      if (!(++count % mds->heartbeat_reset_grace()))
         mds->heartbeat_reset();
     }
   }
@@ -1537,7 +1537,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
     if (client)
       client->got_journaled_agree(p.second, logseg);
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 
@@ -1627,7 +1627,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
     ceph_assert(in);
     mds->mdcache->add_recovered_truncate(in, logseg);
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
   for (const auto& p : truncate_finish) {
@@ -1638,7 +1638,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       mds->mdcache->remove_recovered_truncate(in, ls);
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 
@@ -1660,7 +1660,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
        dout(10) << "EMetaBlob.replay destroyed " << *p << ", not in cache" << dendl;
       }
 
-      if (!(++count % 1000))
+      if (!(++count % mds->heartbeat_reset_grace()))
         mds->heartbeat_reset();
     }
     mds->mdcache->open_file_table.note_destroyed_inos(logseg->seq, destroyed_inodes);
@@ -1682,7 +1682,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       }
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }
 
@@ -1698,7 +1698,7 @@ void EMetaBlob::replay(MDSRank *mds, LogSegment *logseg, MDPeerUpdate *peerup)
       }
     }
 
-    if (!(++count % 1000))
+    if (!(++count % mds->heartbeat_reset_grace()))
       mds->heartbeat_reset();
   }