From: David Zafman <david.zafman@inktank.com>
Date: Thu, 19 Dec 2013 22:37:28 +0000 (-0800)
Subject: osd: Fix assert which doesn't apply when compat_mode on
X-Git-Tag: v0.74~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8879e439213006fa1fab2f62cbe11c8e56a8bcbc;p=ceph.git

osd: Fix assert which doesn't apply when compat_mode on

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit edaec9a8361396bd4c12814c16610669694b5b6c)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 78e770642595..6a26dd4e976d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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