From: Loic Dachary <loic-201408@dachary.org>
Date: Tue, 7 Oct 2014 12:05:08 +0000 (+0200)
Subject: osd: log error if set_ioprio fails to parse class
X-Git-Tag: v0.80.8~53^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f2eec5036a2910aca1e8ce2d94444d3ed0477df;p=ceph.git

osd: log error if set_ioprio fails to parse class

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 5088e0d49332d579ba7e33c2c9baee3d5f701a3e)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index dc67fdd7f0e88..3ca40e86ea5c1 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7931,7 +7931,12 @@ void OSD::set_disk_tp_priority()
 	   << dendl;
   int cls =
     ceph_ioprio_string_to_class(cct->_conf->osd_disk_thread_ioprio_class);
-  disk_tp.set_ioprio(cls, cct->_conf->osd_disk_thread_ioprio_priority);
+  if (cls < 0)
+    derr << __func__ << cpp_strerror(cls) << ": "
+	 << "osd_disk_thread_ioprio_class is " << cct->_conf->osd_disk_thread_ioprio_class
+	 << " but only the following values are allowed: idle, be or rt" << dendl;
+  else
+    disk_tp.set_ioprio(cls, cct->_conf->osd_disk_thread_ioprio_priority);
 }
 
 // --------------------------------