RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1586 from ceph/wip-dirfrag

Browse Source 
mds: fix check for merging/spliting dirfrag

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-04-02 08:44:33 -07:00
commit 86a032f2c2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mds/CDir.h
View File

@ -325,6 +325,7 @@ protected:
return num_dirty;
}
int64_t get_frag_size() { return get_projected_fnode()->fragstat.size(); }
// -- dentries and inodes --
public:
@ -371,10 +372,10 @@ public:
void merge(list<CDir*>& subs, list<Context*>& waiters, bool replay);
bool should_split() {
return (int)get_num_head_items() > g_conf->mds_bal_split_size;
return (int)get_frag_size() > g_conf->mds_bal_split_size;
}
bool should_merge() {
return (int)get_num_head_items() < g_conf->mds_bal_merge_size;
return (int)get_frag_size() < g_conf->mds_bal_merge_size;
}
private:

7
src/mds/MDBalancer.cc
View File

@ -1000,11 +1000,11 @@ void MDBalancer::hit_dir(utime_t now, CDir *dir, int type, int who, double amoun
dir->is_auth()) {
dout(20) << "hit_dir " << type << " pop is " << v << ", frag " << dir->get_frag()
<< " size " << dir->get_num_head_items() << dendl;
<< " size " << dir->get_frag_size() << dendl;
// split
if (g_conf->mds_bal_split_size > 0 &&
((dir->get_num_head_items() > (unsigned)g_conf->mds_bal_split_size) ||
(dir->should_split() ||
(v > g_conf->mds_bal_split_rd && type == META_POP_IRD) ||
(v > g_conf->mds_bal_split_wr && type == META_POP_IWR)) &&
split_queue.count(dir->dirfrag()) == 0) {
@ -1013,8 +1013,7 @@ void MDBalancer::hit_dir(utime_t now, CDir *dir, int type, int who, double amoun
}
// merge?
if (dir->get_frag() != frag_t() &&
(dir->get_num_head_items() < (unsigned)g_conf->mds_bal_merge_size) &&
if (dir->get_frag() != frag_t() && dir->should_merge() &&
merge_queue.count(dir->dirfrag()) == 0) {
dout(10) << "hit_dir " << type << " pop is " << v << ", putting in merge_queue: " << *dir << dendl;
merge_queue.insert(dir->dirfrag());