From: Mykola Golub <mgolub@zhuzha.mirantis.lviv.net>
Date: Tue, 23 Dec 2014 11:39:33 +0000 (+0200)
Subject: 10132: osd: tries to set ioprio when the config option is blank
X-Git-Tag: v0.92~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b41a739f686f34c40343f12c3e924f90f2fa8cf5;p=ceph.git

10132: osd: tries to set ioprio when the config option is blank

According to documentation, ioprio params will only be used if both
osd disk thread ioprio class and osd disk thread ioprio priority are
set to a non default value.

So, add a proper check and do not generate "set_disk_tp_priority(22)
Invalid argument" warning for the default settings.
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c61cff545ea4..c50284ad45aa 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8498,6 +8498,9 @@ void OSD::set_disk_tp_priority()
 	   << " class " << cct->_conf->osd_disk_thread_ioprio_class
 	   << " priority " << cct->_conf->osd_disk_thread_ioprio_priority
 	   << dendl;
+  if (cct->_conf->osd_disk_thread_ioprio_class.empty() ||
+      cct->_conf->osd_disk_thread_ioprio_priority < 0)
+    return;
   int cls =
     ceph_ioprio_string_to_class(cct->_conf->osd_disk_thread_ioprio_class);
   if (cls < 0)