]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: do not exclude me during build_prior
authorSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 06:38:25 +0000 (23:38 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 06:38:25 +0000 (23:38 -0700)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/osd/PG.cc

index 108635e268268fe4cee56ce093c044719fba8263..37996fe6a4199eb67b8fe44f94ba49fa9adcc63b 100644 (file)
@@ -4759,8 +4759,7 @@ PG::PgPriorSet::PgPriorSet(int whoami,
    */
   // current up and/or acting nodes, of course.
   for (unsigned i=0; i<up.size(); i++)
-    if (up[i] != whoami)
-      cur.insert(up[i]);
+    cur.insert(up[i]);
   for (unsigned i=0; i<acting.size(); i++)
     cur.insert(acting[i]);
 
@@ -4806,10 +4805,8 @@ PG::PgPriorSet::PgPriorSet(int whoami,
     for (unsigned i=0; i<interval.up.size(); i++) {
       int o = interval.up[i];
 
-      if (osdmap.is_up(o)) {  // is up now
-       if (o != whoami)       // and is not me
-         cur.insert(o);
-      }
+      if (osdmap.is_up(o)) // is up now
+       cur.insert(o);
     }
 
     // consider ACTING osds