Merge pull request ceph#57106 from phlogistonjohn/jjm-mgr-quiet-notify-types-err

adk3798 · web-flow · commit f2f7cc609cdb · 2024-06-11T12:42:28.000-04:00
mgr: do not require NOTIFY_TYPES in python modules

Reviewed-by: Adam King &lt;adking@redhat.com&gt;
diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc
@@ -515,8 +515,8 @@ int PyModule::load_notify_types()
 {
   PyObject *ls = PyObject_GetAttrString(pClass, "NOTIFY_TYPES");
   if (ls == nullptr) {
-    derr << "Module " << get_name() << " has missing NOTIFY_TYPES member" << dendl;
-    return -EINVAL;
+    dout(10) << "Module " << get_name() << " has no NOTIFY_TYPES member" << dendl;
+    return 0;
   }
   if (!PyObject_TypeCheck(ls, &PyList_Type)) {
     // Relatively easy mistake for human to make, e.g. defining COMMANDS

Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,8 @@ int PyModule::load_notify_types()`
`515`	`515`	`{`
`516`	`516`	`PyObject *ls = PyObject_GetAttrString(pClass, "NOTIFY_TYPES");`
`517`	`517`	`if (ls == nullptr) {`
`518`		`- derr << "Module " << get_name() << " has missing NOTIFY_TYPES member" << dendl;`
`519`		`- return -EINVAL;`
	`518`	`+ dout(10) << "Module " << get_name() << " has no NOTIFY_TYPES member" << dendl;`
	`519`	`+ return 0;`
`520`	`520`	`}`
`521`	`521`	`if (!PyObject_TypeCheck(ls, &PyList_Type)) {`
`522`	`522`	`// Relatively easy mistake for human to make, e.g. defining COMMANDS`