]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Fix assert which doesn't apply when compat_mode on
authorDavid Zafman <david.zafman@inktank.com>
Thu, 19 Dec 2013 22:37:28 +0000 (14:37 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Fri, 20 Dec 2013 05:24:07 +0000 (21:24 -0800)
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit edaec9a8361396bd4c12814c16610669694b5b6c)

src/osd/PG.cc

index 78e77064259536675127f66e7ec84f1a93fbf926..6a26dd4e976d0e87ee7d3316f9775b6fe9cbcf1c 100644 (file)
@@ -1038,7 +1038,7 @@ bool PG::choose_acting(int& newest_update_osd)
     if (want == up) {
       // There can't be any pending backfill if
       // want is the same as crush map up OSDs.
-      assert(backfill.empty());
+      assert(compat_mode || backfill.empty());
       vector<int> empty;
       osd->queue_want_pg_temp(info.pgid, empty);
     } else