From: Alex Marangone <amarangone@digitalocean.com>
Date: Sun, 16 Feb 2020 17:49:13 +0000 (-0800)
Subject: osdmaptool: only change weight if unset with mark-up-in
X-Git-Tag: v16.1.0~826^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2aee5dc7ebb83e3d970869b87043b8b03f9ccd29;p=ceph.git

osdmaptool: only change weight if unset with mark-up-in

Signed-off-by: Alex Marangone <amarangone@digitalocean.com>
---

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 73ad1a535b6f..f47f2cf7dc27 100644
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -345,6 +345,9 @@ int main(int argc, const char **argv)
     for (int i=0; i<n; i++) {
       osdmap.set_state(i, osdmap.get_state(i) | CEPH_OSD_UP);
       osdmap.set_weight(i, CEPH_OSD_IN);
+      if (osdmap.crush->get_item_weight(i) == 0 ) {
+        osdmap.crush->adjust_item_weightf(g_ceph_context, i, 1.0);
+      }
     }
   }