]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: don't fault on osd's "set-device-class" request 16014/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 11 Jul 2017 13:52:02 +0000 (21:52 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 11 Jul 2017 13:52:02 +0000 (21:52 +0800)
So pre-luminous osds can still boot normally.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc

index 7a42528c3d0d8d9b1e9f2c8669e87b92d0c28642..3ae4fda1e6b9755438cf6c50a3c511ed3eb656fd 100644 (file)
@@ -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)