From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Mar 2019 18:07:44 +0000 (-0500)
Subject: crush/CrushWrapper: move_item: do not clobber weight-set weights
X-Git-Tag: v14.2.1~117^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c3adb06a617a499004a4db9c06bbb72b3fb74c1;p=ceph.git

crush/CrushWrapper: move_item: do not clobber weight-set weights

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

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index dd0d9df326a38..12e4ca10e3846 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1184,7 +1184,8 @@ int CrushWrapper::move_bucket(
   int bucket_weight = detach_bucket(cct, id);
 
   // insert the bucket back into the hierarchy
-  return insert_item(cct, id, bucket_weight / (float)0x10000, id_name, loc);
+  return insert_item(cct, id, bucket_weight / (float)0x10000, id_name, loc,
+		     false);
 }
 
 int CrushWrapper::detach_bucket(CephContext *cct, int item)