RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6119 from athanatos/wip-13192

Browse Source 
Wip 13192

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-09-29 20:32:47 -04:00
commit bc627ba8c2
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/HitSet.cc
View File

@ -36,9 +36,6 @@ HitSet::HitSet(const HitSet::Params& params)
impl.reset(new ExplicitObjectHitSet(static_cast<ExplicitObjectHitSet::Params*>(params.impl.get())));
break;
case TYPE_NONE:
break;
default:
assert (0 == "unknown HitSet type");
}

18
src/osd/ReplicatedPG.cc
View File

@ -10785,15 +10785,19 @@ void ReplicatedPG::hit_set_clear()
void ReplicatedPG::hit_set_setup()
{
if (!is_active() ||
!is_primary() ||
!pool.info.hit_set_count ||
!pool.info.hit_set_period ||
pool.info.hit_set_params.get_type() == HitSet::TYPE_NONE) {
!is_primary()) {
hit_set_clear();
// only primary is allowed to remove all the hit set objects
if (is_primary() && is_peered()) {
hit_set_remove_all();
return;
}
if (is_active() && is_primary() &&
(!pool.info.hit_set_count ||
!pool.info.hit_set_period ||
pool.info.hit_set_params.get_type() == HitSet::TYPE_NONE)) {
hit_set_clear();
// only primary is allowed to remove all the hit set objects
hit_set_remove_all();
return;
}