RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/PyModule: populate ModuleOptions and expose to mon

Browse Source 
Populate the ModuleOptions from MODULE_OPTIONS fields and pass it to the
mon for inclusion in the MgrMap.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-12-17 14:22:33 -06:00
parent ff09eb6715
commit 1f3e9d4811
3 changed files with 76 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mgr/MgrStandby.cc
View File

@ -195,6 +195,7 @@ void MgrStandby::send_beacon()
info.name = module->get_name();
info.error_string = module->get_error_string();
info.can_run = module->get_can_run();
info.module_options = module->get_options();
module_info.push_back(std::move(info));
}

77
src/mgr/PyModule.cc
View File

@ -515,15 +515,78 @@ int PyModule::load_commands()
int PyModule::load_options()
{
int r = walk_dict_list("MODULE_OPTIONS", [this](PyObject *pOption) -> int {
PyObject *pName = PyDict_GetItemString(pOption, "name");
ceph_assert(pName != nullptr);
ModuleOption option;
option.name = PyString_AsString(pName);
MgrMap::ModuleOption option;
PyObject *p;
p = PyDict_GetItemString(pOption, "name");
ceph_assert(p != nullptr);
option.name = PyString_AsString(p);
option.type = Option::TYPE_STR;
p = PyDict_GetItemString(pOption, "type");
if (p && PyObject_TypeCheck(p, &PyString_Type)) {
std::string s = PyString_AsString(p);
int t = Option::str_to_type(s);
if (t >= 0) {
option.type = t;
}
}
p = PyDict_GetItemString(pOption, "desc");
if (p && PyObject_TypeCheck(p, &PyString_Type)) {
option.desc = PyString_AsString(p);
}
p = PyDict_GetItemString(pOption, "long_desc");
if (p && PyObject_TypeCheck(p, &PyString_Type)) {
option.long_desc = PyString_AsString(p);
}
p = PyDict_GetItemString(pOption, "default");
if (p && PyObject_TypeCheck(p, &PyString_Type)) {
option.default_value = PyString_AsString(p);
}
p = PyDict_GetItemString(pOption, "min");
if (p && PyObject_TypeCheck(p, &PyString_Type)) {
option.min = PyString_AsString(p);
}
p = PyDict_GetItemString(pOption, "max");
if (p && PyObject_TypeCheck(p, &PyString_Type)) {
option.max = PyString_AsString(p);
}
p = PyDict_GetItemString(pOption, "enum_allowed");
if (p && PyObject_TypeCheck(p, &PyList_Type)) {
for (unsigned i = 0; i < PyList_Size(p); ++i) {
auto q = PyList_GetItem(p, i);
if (q && PyObject_TypeCheck(q, &PyString_Type)) {
option.enum_allowed.insert(PyString_AsString(q));
}
}
}
p = PyDict_GetItemString(pOption, "see_also");
if (p && PyObject_TypeCheck(p, &PyList_Type)) {
for (unsigned i = 0; i < PyList_Size(p); ++i) {
auto q = PyList_GetItem(p, i);
if (q && PyObject_TypeCheck(q, &PyString_Type)) {
option.see_also.insert(PyString_AsString(q));
}
}
}
p = PyDict_GetItemString(pOption, "tags");
if (p && PyObject_TypeCheck(p, &PyList_Type)) {
for (unsigned i = 0; i < PyList_Size(p); ++i) {
auto q = PyList_GetItem(p, i);
if (q && PyObject_TypeCheck(q, &PyString_Type)) {
option.tags.insert(PyString_AsString(q));
}
}
}
p = PyDict_GetItemString(pOption, "runtime");
if (p && PyObject_TypeCheck(p, &PyBool_Type)) {
if (p == Py_True) {
option.flags |= Option::FLAG_RUNTIME;
}
if (p == Py_False) {
option.flags &= ~Option::FLAG_RUNTIME;
}
}
dout(20) << "loaded module option " << option.name << dendl;
options[option.name] = std::move(option);
return 0;
});

15
src/mgr/PyModule.h
View File

@ -21,6 +21,7 @@
#include "common/Mutex.h"
#include "Python.h"
#include "Gil.h"
#include "mon/MgrMap.h"
class MonClient;
@ -43,15 +44,6 @@ public:
std::string module_name;
};
/**
* An option declared by the python module in its configuration schema
*/
class ModuleOption {
public:
std::string name;
};
class PyModule
{
mutable Mutex lock{"PyModule::lock"};
@ -90,7 +82,7 @@ private:
std::vector<ModuleCommand> commands;
int load_options();
std::map<std::string, ModuleOption> options;
std::map<std::string, MgrMap::ModuleOption> options;
public:
static std::string config_prefix;
@ -107,6 +99,9 @@ public:
~PyModule();
bool is_option(const std::string &option_name);
const std::map<std::string,MgrMap::ModuleOption>& get_options() const {
return options;
}
int load(PyThreadState *pMainThreadState);
#if PY_MAJOR_VERSION >= 3