]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: the warning seems more serious than what it wanna transmit 27509/head
authorZengran Zhang <zhangzengran@sangfor.com.cn>
Thu, 11 Apr 2019 07:07:08 +0000 (15:07 +0800)
committerZengran Zhang <zhangzengran@sangfor.com.cn>
Tue, 16 Apr 2019 02:00:37 +0000 (10:00 +0800)
The missing items is picked from primary and peers, so it is normal if
some guys missing the same version, assertion on the next line will check
wrong circumstances.

Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
src/osd/PG.h

index a8d9d745fc6f6bb864b6ca2335472a7bce07012a..fd37b4e456ef36fd5fba8ce4b3c8a0052ae48df8 100644 (file)
@@ -826,10 +826,13 @@ protected:
        if (j == needs_recovery_map.end()) {
          needs_recovery_map.insert(*i);
        } else {
-         lgeneric_dout(pg->cct, 0) << this << " " << pg->info.pgid << " unexpected need for "
-                                   << i->first << " have " << j->second
-                                   << " tried to add " << i->second << dendl;
-         ceph_assert(i->second.need == j->second.need);
+         if (i->second.need != j->second.need) {
+           lgeneric_dout(pg->cct, 0) << this << " " << pg->info.pgid << " unexpected need for "
+                                     << i->first << " have " << j->second
+                                     << " tried to add " << i->second << dendl;
+           ceph_assert(0 == "unexpected need for missing item");
+
+         }
        }
       }
     }