From 33a2e3797d54961ed09ca86f6f4eb5ff21093929 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 29 Apr 2016 15:44:04 -0400 Subject: [PATCH] osd: pay attention to shard when setting role This matches start_peering_interval(). Signed-off-by: Sage Weil --- src/osd/OSD.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 7b864a52f776f..8b905bf199d49 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3222,7 +3222,10 @@ void OSD::load_pgs() up_primary, primary); int role = OSDMap::calc_pg_role(whoami, pg->acting); - pg->set_role(role); + if (pg->pool.info.is_replicated() || role == pg->pg_whoami.shard) + pg->set_role(role); + else + pg->set_role(-1); pg->reg_next_scrub(); -- 2.39.5