From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 11 Jul 2017 13:52:02 +0000 (+0800)
Subject: osd/OSD: don't fault on osd's "set-device-class" request
X-Git-Tag: v12.1.1~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7ca4bccaa62e746852ed4601ba0201752e8db09;p=ceph.git

osd/OSD: don't fault on osd's "set-device-class" request

So pre-luminous osds can still boot normally.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7a42528c3d0d..3ae4fda1e6b9 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3456,7 +3456,12 @@ int OSD::update_crush_device_class()
     string("\"class\": \"") + device_class + string("\", ") +
     string("\"ids\": [\"") + stringify(whoami) + string("\"]}");
 
-  return mon_cmd_maybe_osd_create(cmd);
+  r = mon_cmd_maybe_osd_create(cmd);
+  if (r == -EPERM) {
+    r = 0;
+  }
+
+  return r;
 }
 
 void OSD::write_superblock(ObjectStore::Transaction& t)