mgr/mgr_module: fix tox test missing a type annotation

After changes of PR #67327

Signed-off-by: Nitzan Mordechai <nmordech@ibm.com>
(cherry picked from commit e2826197531cb0e4c48b79cafaa11098b16456f6)

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 78f172636522564385a617017edd21a40ec1005a..e929447497a7a516f29a35668637f97e9f8e26ca 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -677,14 +677,15 @@ class CPlusPlusHandler(logging.Handler):
         if record.levelno >= self.level:
             self._module._ceph_log(self.format(record))
 
+
 class MgrRootHandler(CPlusPlusHandler):
-    def __init__(self, module_inst):
+    def __init__(self, module_inst: 'MgrModuleLoggingMixin') -> None:
         super().__init__(module_inst)
         self.setFormatter(logging.Formatter(
             "[mgr %(levelname)-4s %(name)s] %(message)s"
         ))
 
-    def emit(self, record):
+    def emit(self, record: logging.LogRecord) -> None:
         record.name = "mgr"
         super().emit(record)
 
@@ -723,6 +724,8 @@ class FileHandler(logging.FileHandler):
 
 
 class MgrModuleLoggingMixin(object):
+    module_name: str
+
     def _configure_logging(self,
                            mgr_level: str,
                            module_level: str,
@@ -846,10 +849,13 @@ class MgrModuleLoggingMixin(object):
             log_level = "INFO"
         return log_level
 
-    def getLogger(self, name=None):
+    def getLogger(self, name: Optional[str] = None) -> logging.Logger:
+        logger = getattr(self, '_module_logger', None) \
+            or logging.getLogger(self.module_name)
         if name is None:
-            return self._module_logger
-        return self._module_logger.getChild(name)
+            return logger
+        return logger.getChild(name)
+
 
 class MgrStandbyModule(ceph_module.BaseMgrStandbyModule, MgrModuleLoggingMixin):
     """

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index d81734fbf507e76bb682aa2d7889085aa93ce3ab..e1ac7da4b0146d559923a686bed6356de4ea718e 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -866,7 +866,7 @@ class ServiceSpec(object):
         sub_cls: Any = cls._cls(service_type)
         return object.__new__(sub_cls)
 
-    def __getnewargs__(self):
+    def __getnewargs__(self) -> tuple[str]:
         """
         Pickle will pass the return of this function to __new__ upon
         unpickle.  We need to ensure it gets service_type in order