From: Sage Weil <sage@redhat.com>
Date: Mon, 1 May 2017 23:14:53 +0000 (-0500)
Subject: osd/OSDMap: upmap: fix bug
X-Git-Tag: v12.1.0~10^2~91^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f12220b01f39cee28bf7143d3b8f49088962ff7;p=ceph.git

osd/OSDMap: upmap: fix bug

Use deviation for this item, not the max deviation.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 1f69ac706444..278457dbcd7d 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3502,8 +3502,8 @@ int OSDMap::calc_pg_upmaps(
     bool restart = false;
     for (auto p = deviation_osd.rbegin(); p != deviation_osd.rend(); ++p) {
       int osd = p->second;
+      float deviation = p->first;
       float target = osd_weight[osd] * pgs_per_weight;
-      float deviation = deviation_osd.rbegin()->first;
       if (deviation/target < max_deviation) {
 	ldout(cct, 10) << " osd." << osd
 		       << " target " << target