From b41a739f686f34c40343f12c3e924f90f2fa8cf5 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 23 Dec 2014 13:39:33 +0200 Subject: [PATCH] 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. --- src/osd/OSD.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c61cff545ea4d..c50284ad45aad 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) -- 2.39.5