From: Samuel Just <sam.just@inktank.com>
Date: Tue, 1 Apr 2014 19:19:52 +0000 (-0700)
Subject: PG: set role for replicated even if role != shard
X-Git-Tag: v0.79~22^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a76a129f75fa8611638fea444a2bded891ed9cbd;p=ceph.git

PG: set role for replicated even if role != shard

Fixes: #7939
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fab6981688f7..55d791cbe9d3 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4644,7 +4644,7 @@ void PG::start_peering_interval(
     state_clear(PG_STATE_REMAPPED);
 
   int role = osdmap->calc_pg_role(osd->whoami, acting, acting.size());
-  if (role == pg_whoami.shard)
+  if (pool.info.is_replicated() || role == pg_whoami.shard)
     set_role(role);
   else
     set_role(-1);