]> git.apps.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>
Thu, 19 Dec 2013 22:37:28 +0000 (14:37 -0800)
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/PG.cc

index 0ae5b76161cece7ca02b9d0c2d40b0220d7cf96b..98515e5f1408b12723c356b4c4f66448ad736529 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