From: Sage Weil <sage.weil@dreamhost.com>
Date: Sat, 12 Nov 2011 22:04:15 +0000 (-0800)
Subject: mon: fix 'osd crush add ..' weight
X-Git-Tag: v0.39~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73f99a189f491866da2be88adcfe0bd512282755;p=ceph-ci.git

mon: fix 'osd crush add ..' weight

This was changed to floating point in commit 3f67893.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 15186a0e0ce..a2b6d5f83dd 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1503,9 +1503,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 	bufferlist::iterator p = bl.begin();
 	newcrush.decode(p);
 
-	if (id >= newcrush.get_max_devices())
-	  newcrush.set_max_devices(id + 1);
-	err = newcrush.insert_item(id, (int)(weight * (float)0x10000), name, loc);
+	err = newcrush.insert_item(id, weight, name, loc);
 	if (err == 0) {
 	  if (newcrush.get_max_devices() > osdmap.get_max_osd()) {
 	    err = -ERANGE;