From: Gu Zhongyan <guzhongyan@360.cn>
Date: Mon, 2 Apr 2018 10:01:13 +0000 (+0800)
Subject: mon: cleanup "osd crush set-device-class" log messages
X-Git-Tag: v13.1.0~278^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21174%2Fhead;p=ceph.git

mon: cleanup "osd crush set-device-class" log messages

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index c72a8acedf2d..c9596eb04755 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1893,7 +1893,7 @@ int CrushWrapper::update_device_class(int id,
   if (old_class_name && old_class_name != class_name) {
     *ss << "osd." << id << " has already bound to class '" << old_class_name
         << "', can not reset class to '" << class_name  << "'; "
-        << "use 'ceph osd crush rm-device-class <osd>' to "
+        << "use 'ceph osd crush rm-device-class <id>' to "
         << "remove old class first";
     return -EBUSY;
   }
@@ -1905,7 +1905,7 @@ int CrushWrapper::update_device_class(int id,
   }
 
   if (class_map.count(id) != 0 && class_map[id] == class_id) {
-    *ss << name << " already set to class " << class_name;
+    *ss << name << " already set to class " << class_name << ". ";
     return 0;
   }
 
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9eb62370a4db..3bf3992a19d7 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7517,7 +7517,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
           if (!stop) {
             // for single osd only, wildcard makes too much noise
             ss << "set-device-class item id " << osd << " name '" << name
-               << "' device_class '" << device_class << "': no change";
+               << "' device_class '" << device_class << "': no change. ";
           }
         } else {
           updated.insert(osd);