From: Sage Weil <sage@redhat.com>
Date: Sun, 22 Sep 2019 18:29:18 +0000 (-0500)
Subject: common/config: EPERM setting config option after startup
X-Git-Tag: v15.1.0~1323^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f47d10bab39c784319c7e81707a9ad17c63c8e9;p=ceph.git

common/config: EPERM setting config option after startup

Not sure why ENOSYS was chosen before...

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/config.cc b/src/common/config.cc
index d5c9e1c6f87f..0259ef2f8ee2 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -1379,7 +1379,7 @@ int md_config_t::_set_val(
     if (new_value != _get_val_nometa(values, opt)) {
       *error_message = string("Configuration option '") + opt.name +
 	"' may not be modified at runtime";
-      return -ENOSYS;
+      return -EPERM;
     }
   }
 
diff --git a/src/test/daemon_config.cc b/src/test/daemon_config.cc
index bfe993798756..26048868f25f 100644
--- a/src/test/daemon_config.cc
+++ b/src/test/daemon_config.cc
@@ -204,7 +204,7 @@ TEST(DaemonConfig, InjectArgsReject) {
   // variable and there isn't an observer for it.
   std::string injection2("--osd_data /tmp/some-other-directory --log-graylog-port 4");
   ret = g_ceph_context->_conf.injectargs(injection2, &cout);
-  ASSERT_EQ(-ENOSYS, ret);
+  ASSERT_EQ(-EPERM, ret);
 
   // It should be unchanged.
   memset(buf2, 0, sizeof(buf2));
@@ -316,7 +316,7 @@ TEST(DaemonConfig, ThreadSafety1) {
   // Verify that we can't change this, since safe_to_start_threads has
   // been set.
   ret = g_ceph_context->_conf.set_val("osd_data", "");
-  ASSERT_EQ(-ENOSYS, ret);
+  ASSERT_EQ(-EPERM, ret);
 
   g_conf()._clear_safe_to_start_threads();