RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: Fix useless MAX(0, unsigned) to prevent out of wack misplaced

Browse Source 
Still want to prevent strange results if for some reason num_objects
is less than osd_missing.

Fixes: http://tracker.ceph.com/issues/18718

Signed-off-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
David Zafman 2017-01-27 14:42:37 -08:00
parent 81e3a9dd9e
commit fff2b63d24
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/PG.cc
View File

@ -2518,7 +2518,7 @@ void PG::_update_calc_stats()
// in acting and not in up Compute misplaced objects excluding num_missing
// in up and not in acting Compute total objects already backfilled
if (in_acting) {
int osd_missing;
unsigned osd_missing;
// primary handling
if (p == pg_whoami) {
osd_missing = pg_log.get_missing().num_missing();
@ -2532,8 +2532,8 @@ void PG::_update_calc_stats()
}
missing += osd_missing;
// Count non-missing objects not in up as misplaced
if (!in_up)
misplaced += MAX(0, num_objects - osd_missing);
if (!in_up && num_objects > osd_missing)
misplaced += num_objects - osd_missing;
} else {
assert(in_up && !in_acting);