Merge pull request #27509 from Aran85/fix-pg-dout

osd/PG: the warning seems more serious than what it wanna transmit

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Kefu Chai 2019-04-20 14:10:39 +08:00 committed by GitHub
commit ebc6db7fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View 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");
}
}
}
}