RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30022 from Yan-waller/wip-yanj-miscleanup

Browse Source 
osd: misc cleanups

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Xie Xingguo 2019-08-30 16:12:07 +08:00 committed by GitHub
commit 973e1312ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/OSD.cc
View File

@ -10335,8 +10335,7 @@ void OSDShard::identify_splits_and_merges(
split_pgs, nullptr);
} else {
dout(20) << __func__ << " slot " << pgid
<< " has no pg and waiting_for_split "
<< slot->waiting_for_split << dendl;
<< " has no pg and waiting_for_split " << dendl;
}
}
}

9
src/osd/OSD.h
View File

@ -714,15 +714,6 @@ public:
deleted_pool_pg_nums[pool] = pg_num;
}
/// get pgnum from newmap or, if pool was deleted, last map pool existed in
int get_possibly_deleted_pool_pg_num(OSDMapRef newmap,
int64_t pool) {
if (newmap->have_pg_pool(pool)) {
return newmap->get_pg_num(pool);
}
return get_deleted_pool_pg_num(pool);
}
/// identify split child pgids over a osdmap interval
void identify_splits_and_merges(
OSDMapRef old_map,