From 576dfc5bc21974091a0628538603fdde8ab0dca6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 4 Dec 2018 17:32:40 -0600 Subject: [PATCH] mgr: rename internal ceph_set_config -> ceph_set_module_option Signed-off-by: Sage Weil --- src/mgr/BaseMgrModule.cc | 8 ++++---- src/mgr/BaseMgrStandbyModule.cc | 2 +- src/pybind/mgr/mgr_module.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mgr/BaseMgrModule.cc b/src/mgr/BaseMgrModule.cc index 2833e27766218..9aeca666996ea 100644 --- a/src/mgr/BaseMgrModule.cc +++ b/src/mgr/BaseMgrModule.cc @@ -420,11 +420,11 @@ ceph_store_get_prefix(BaseMgrModule *self, PyObject *args) } static PyObject* -ceph_config_set(BaseMgrModule *self, PyObject *args) +ceph_set_module_option(BaseMgrModule *self, PyObject *args) { char *key = nullptr; char *value = nullptr; - if (!PyArg_ParseTuple(args, "sz:ceph_config_set", &key, &value)) { + if (!PyArg_ParseTuple(args, "sz:ceph_set_module_option", &key, &value)) { return nullptr; } boost::optional val; @@ -967,8 +967,8 @@ PyMethodDef BaseMgrModule_methods[] = { {"_ceph_get_store_prefix", (PyCFunction)ceph_store_get_prefix, METH_VARARGS, "Get all KV store values with a given prefix"}, - {"_ceph_set_config", (PyCFunction)ceph_config_set, METH_VARARGS, - "Set a configuration value"}, + {"_ceph_set_module_option", (PyCFunction)ceph_set_module_option, METH_VARARGS, + "Set a module configuration option value"}, {"_ceph_get_store", (PyCFunction)ceph_store_get, METH_VARARGS, "Get a stored field"}, diff --git a/src/mgr/BaseMgrStandbyModule.cc b/src/mgr/BaseMgrStandbyModule.cc index 088bb91838d8c..991cbf94ad6c6 100644 --- a/src/mgr/BaseMgrStandbyModule.cc +++ b/src/mgr/BaseMgrStandbyModule.cc @@ -134,7 +134,7 @@ PyMethodDef BaseMgrStandbyModule_methods[] = { "Get the name of the Mgr daemon where we are running"}, {"_ceph_get_module_option", (PyCFunction)ceph_get_module_option, METH_VARARGS, - "Get a configuration value"}, + "Get a module configuration option value"}, {"_ceph_get_store", (PyCFunction)ceph_store_get, METH_VARARGS, "Get a KV store value"}, diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py index 7ae94b56b1657..362c085fbd52f 100644 --- a/src/pybind/mgr/mgr_module.py +++ b/src/pybind/mgr/mgr_module.py @@ -736,7 +736,7 @@ class MgrModule(ceph_module.BaseMgrModule): return self._get_localized(key, default, self._get_module_option) def _set_module_option(self, key, val): - return self._ceph_set_config(key, val) + return self._ceph_set_module_option(key, val) def set_module_option(self, key, val): """ -- 2.39.5