RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-13 14:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG: hit_set_setup, agent_setup, skip if !active

Browse Source 
We call these in on_activate and on_pool_change.  In the former, we are
necessarily active.  In the latter, we only want to do anything if we are
active (otherwise, it will be taken care of when we eventually do become
active).

Fixes: #7904
Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2014-03-28 15:57:43 -07:00
parent a6be1d6713
commit 1aa1d9380b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/ReplicatedPG.cc
View File

@ -10231,7 +10231,8 @@ void ReplicatedPG::hit_set_clear()
void ReplicatedPG::hit_set_setup()
{
if (!is_primary() ||
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) {
@ -10518,7 +10519,8 @@ void ReplicatedPG::hit_set_trim(RepGather *repop, unsigned max)
void ReplicatedPG::agent_setup()
{
assert(is_locked());
if (!is_primary() ||
if (!is_active() ||
!is_primary() ||
pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE ||
pool.info.tier_of < 0 ||
!get_osdmap()->have_pg_pool(pool.info.tier_of)) {