From: Sage Weil <sage@redhat.com>
Date: Fri, 5 Jun 2015 19:15:22 +0000 (-0700)
Subject: crush/CrushWrapper: adjust subtree base in adjust_subtree_weight
X-Git-Tag: v0.94.4~61^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05fc59bee9138d04227255a2f31bd82efe94b1e9;p=ceph.git

crush/CrushWrapper: adjust subtree base in adjust_subtree_weight

We were correctly adjusting all the children, but the subtree root was
not being updated.

Fixes: #11855
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1da96ab8442522bda4fc39e05597f17b8ebddf89)
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index ec3414b3dda..407a6be88f0 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -842,10 +842,12 @@ int CrushWrapper::adjust_subtree_weight(CephContext *cct, int id, int weight)
   while (!q.empty()) {
     b = q.front();
     q.pop_front();
+    int local_changed = 0;
     for (unsigned i=0; i<b->size; ++i) {
       int n = b->items[i];
       if (n >= 0) {
 	crush_bucket_adjust_item_weight(crush, b, n, weight);
+	++local_changed;
       } else {
 	crush_bucket *sub = get_bucket(n);
 	if (IS_ERR(sub))
@@ -853,6 +855,9 @@ int CrushWrapper::adjust_subtree_weight(CephContext *cct, int id, int weight)
 	q.push_back(sub);
       }
     }
+    if (local_changed) {
+      adjust_item_weight(cct, b->id, b->weight);
+    }
   }
   return changed;
 }