From: Kefu Chai <kchai@redhat.com>
Date: Tue, 26 May 2015 08:58:23 +0000 (+0800)
Subject: mon: check the new crush map against osdmap.max_osd
X-Git-Tag: v9.0.3~196^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22e6bd6e01d5df3f3e897562597e22ca1737f8c8;p=ceph.git

mon: check the new crush map against osdmap.max_osd

Fixes: #11680
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 91e249ce679d..c60b273f233d 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4841,7 +4841,7 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
     dout(10) << " testing map" << dendl;
     stringstream ess;
     CrushTester tester(crush, ess);
-    if (!tester.check_name_maps()) {
+    if (!tester.check_name_maps(osdmap.get_max_osd())) {
       err = -EINVAL;
       ss << ess.str();
       goto reply;