crush/CrushWrapper: refactor adjust_weight_* into per-bucket helper

This unifies the regular and _in_loc variants.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 937da65265e81090ec6e4ae8b14184c4f175564a)

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 4a442abb6f4988d0c0e98eff160a7d1f02f5f1c7..81470ac0140e4bac6075aff5671218fe35aa6139 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1443,50 +1443,69 @@ int CrushWrapper::get_item_weight_in_loc(int id, const map<string,string> &loc)
 
 int CrushWrapper::adjust_item_weight(CephContext *cct, int id, int weight)
 {
-  ldout(cct, 5) << "adjust_item_weight " << id << " weight " << weight << dendl;
+  ldout(cct, 5) << __func__ << " " << id << " weight " << weight << dendl;
   int changed = 0;
   for (int bidx = 0; bidx < crush->max_buckets; bidx++) {
-    crush_bucket *b = crush->buckets[bidx];
-    if (b == 0)
+    if (!crush->buckets[bidx]) {
       continue;
-    for (unsigned i = 0; i < b->size; i++) {
-      if (b->items[i] == id) {
-       int diff = bucket_adjust_item_weight(cct, b, id, weight);
-       ldout(cct, 5) << "adjust_item_weight " << id << " diff " << diff
-                     << " in bucket " << bidx << dendl;
-       adjust_item_weight(cct, -1 - bidx, b->weight);
-       changed++;
-      }
+    }
+    int r = adjust_item_weight_in_bucket(cct, id, weight, -1-bidx);
+    if (r > 0) {
+      ++changed;
     }
   }
-  if (!changed)
+  if (!changed) {
     return -ENOENT;
+  }
   return changed;
 }
 
-int CrushWrapper::adjust_item_weight_in_loc(CephContext *cct, int id, int weight, const map<string,string>& loc)
+int CrushWrapper::adjust_item_weight_in_bucket(
+  CephContext *cct, int id, int weight,
+  int bucket_id)
+{
+  ldout(cct, 5) << __func__ << " " << id << " weight " << weight
+               << " in bucket " << bucket_id
+               << dendl;
+  int changed = 0;
+  if (!bucket_exists(bucket_id)) {
+    return -ENOENT;
+  }
+  crush_bucket *b = get_bucket(bucket_id);
+  for (unsigned int i = 0; i < b->size; i++) {
+    if (b->items[i] == id) {
+      int diff = bucket_adjust_item_weight(cct, b, id, weight);
+      ldout(cct, 5) << __func__ << " " << id << " diff " << diff
+                   << " in bucket " << bucket_id << dendl;
+      adjust_item_weight(cct, bucket_id, b->weight);
+      changed++;
+    }
+  }
+  if (!changed) {
+    return -ENOENT;
+  }
+  return changed;
+}
+
+int CrushWrapper::adjust_item_weight_in_loc(
+  CephContext *cct, int id, int weight,
+  const map<string,string>& loc)
 {
   ldout(cct, 5) << "adjust_item_weight_in_loc " << id << " weight " << weight
                << " in " << loc << dendl;
   int changed = 0;
-
   for (auto l = loc.begin(); l != loc.end(); ++l) {
     int bid = get_item_id(l->second);
     if (!bucket_exists(bid))
       continue;
-    crush_bucket *b = get_bucket(bid);
-    for (unsigned int i = 0; i < b->size; i++) {
-      if (b->items[i] == id) {
-       int diff = bucket_adjust_item_weight(cct, b, id, weight);
-       ldout(cct, 5) << "adjust_item_weight_in_loc " << id << " diff " << diff
-                     << " in bucket " << bid << dendl;
-       adjust_item_weight(cct, bid, b->weight);
-       changed++;
-      }
+    int r = adjust_item_weight_in_bucket(cct, id, weight, bid);
+    if (r > 0) {
+      ++changed;
     }
   }
-  if (!changed)
+  if (!changed) {
     return -ENOENT;
+  }
   return changed;
 }
 

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 89cbb4e4ba9fdebd4a91401a85f9ee9256a1866d..e3668729def250f80f1d3872d33f6fe321ba04bf 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -964,8 +964,12 @@ public:
     }
     return adjust_item_weight(cct, id, (int)(weight * (float)0x10000));
   }
-  int adjust_item_weight_in_loc(CephContext *cct, int id, int weight, const map<string,string>& loc);
-  int adjust_item_weightf_in_loc(CephContext *cct, int id, float weight, const map<string,string>& loc) {
+  int adjust_item_weight_in_bucket(
+    CephContext *cct, int id, int weight, int bucket_id);
+  int adjust_item_weight_in_loc(CephContext *cct, int id, int weight,
+                               const map<string,string>& loc);
+  int adjust_item_weightf_in_loc(CephContext *cct, int id, float weight,
+                                const map<string,string>& loc) {
     int r = validate_weightf(weight);
     if (r < 0) {
       return r;