From: Samuel Just <sam.just@inktank.com>
Date: Fri, 21 Feb 2014 19:59:04 +0000 (-0800)
Subject: Objecter: resend op if primary role changed
X-Git-Tag: v0.78~131^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=005b4fad14f26317111702e85bab0fa972afa757;p=ceph.git

Objecter: resend op if primary role changed

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 28243ea4f423..fb80f3c85252 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1387,6 +1387,9 @@ bool Objecter::is_pg_changed(
     return true;     // was empty, now not, or vice versa
   if (oldprimary != newprimary)
     return true;     // primary changed
+  if (OSDMap::calc_pg_rank(oldprimary, oldacting) !=
+      OSDMap::calc_pg_rank(newprimary, newacting))
+    return true;
   if (any_change && oldacting != newacting)
     return true;
   return false;      // same primary (tho replicas may have changed)