issue_caps(*p);
}
-bool Locker::issue_caps(CInode *in, Capability *only_cap)
+int Locker::issue_caps(CInode *in, Capability *only_cap)
{
// allowed caps are determined by the lock mode.
int all_allowed = in->get_caps_allowed_by_type(CAP_ANY);
break;
}
- return (nissued == 0); // true if no re-issued, no callbacks
+ return nissued;
}
void Locker::issue_truncate(CInode *in)
public:
version_t issue_file_data_version(CInode *in);
Capability* issue_new_caps(CInode *in, int mode, Session *session, SnapRealm *conrealm, bool is_replay);
- bool issue_caps(CInode *in, Capability *only_cap=0);
+ int issue_caps(CInode *in, Capability *only_cap=0);
void issue_caps_set(std::set<CInode*>& inset);
void issue_truncate(CInode *in);
void revoke_stale_caps(Session *session);
void MDCache::trim_unlinked_inodes()
{
dout(7) << "trim_unlinked_inodes" << dendl;
- list<CInode*> q;
+ int count = 0;
+ vector<CInode*> q;
for (auto &p : inode_map) {
CInode *in = p.second;
if (in->get_parent_dn() == NULL && !in->is_base()) {
dout(7) << " will trim from " << *in << dendl;
q.push_back(in);
}
+
+ if (!(++count % 1000))
+ mds->heartbeat_reset();
+ }
+
+ for (auto& in : q) {
+ remove_inode_recursive(in);
+
+ if (!(++count % 1000))
+ mds->heartbeat_reset();
}
- for (list<CInode*>::iterator p = q.begin(); p != q.end(); ++p)
- remove_inode_recursive(*p);
}
/** recalc_auth_bits()
{
dout(10) << "choose_lock_states_and_reconnect_caps" << dendl;
+ int count = 0;
for (auto p : inode_map) {
CInode *in = p.second;
-
if (in->last != CEPH_NOSNAP)
continue;
in->get(CInode::PIN_OPENINGSNAPPARENTS);
rejoin_pending_snaprealms.insert(in);
}
+
+ if (!(++count % 1000))
+ mds->heartbeat_reset();
}
}
stringstream warn_str;
+ int count = 0;
for (auto p = cap_imports.begin(); p != cap_imports.end(); ++p) {
warn_str << " ino " << p->first << "\n";
for (auto q = p->second.begin(); q != p->second.end(); ++q) {
}
}
- mds->heartbeat_reset();
+ if (!(++count % 1000))
+ mds->heartbeat_reset();
}
for (map<inodeno_t, MDSContext::vec >::iterator p = cap_reconnect_waiters.begin();
{
dout(10) << "reissue_all_caps" << dendl;
+ int count = 0;
for (auto &p : inode_map) {
+ int n = 1;
CInode *in = p.second;
if (in->is_head() && in->is_any_caps()) {
// called by MDSRank::active_start(). There shouldn't be any frozen subtree.
continue;
}
if (!mds->locker->eval(in, CEPH_CAP_LOCKS))
- mds->locker->issue_caps(in);
+ n += mds->locker->issue_caps(in);
}
+
+ if ((count % 1000) + n >= 1000)
+ mds->heartbeat_reset();
+ count += n;
}
}
void MDCache::identify_files_to_recover()
{
dout(10) << "identify_files_to_recover" << dendl;
+ int count = 0;
for (auto &p : inode_map) {
CInode *in = p.second;
if (!in->is_auth())
} else {
rejoin_check_q.push_back(in);
}
+
+ if (!(++count % 1000))
+ mds->heartbeat_reset();
}
}
mds->server->force_clients_readonly();
// revoke write caps
+ int count = 0;
for (auto &p : inode_map) {
CInode *in = p.second;
if (in->is_head())
mds->locker->eval(in, CEPH_CAP_LOCKS);
+ if (!(++count % 1000))
+ mds->heartbeat_reset();
}
mds->mdlog->flush();