pybind/mgr/*: fix config_notify handling of default values

The default values are handled by mgr_module.py's _get_module_option();
the or here means that we break any non-true (0, false, none) value and
override it with the default.

https://tracker.ceph.com/issues/43746
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5ace82e65c72847fb875fc01c419937a26a59d70)

Conflicts:
	src/pybind/mgr/cephadm/module.py
- nautilus has no "cephadm" module. It does have an "orchestrator_cli"
  module but it doesn't contain the code being patched
	src/pybind/mgr/hello/module.py
- nautilus has a "hello" module, but it doesn't contain the code being
  patched

diff --git a/src/pybind/mgr/alerts/module.py b/src/pybind/mgr/alerts/module.py
index 5962e3018500d45a5990843ab5241d4f48a02af5..2567f7ee2f230811f934f7fccef6e317cb81beac 100644 (file)
--- a/src/pybind/mgr/alerts/module.py
+++ b/src/pybind/mgr/alerts/module.py
@@ -105,7 +105,7 @@ class Alerts(MgrModule):
         for opt in self.MODULE_OPTIONS:
             setattr(self,
                     opt['name'],
-                    self.get_module_option(opt['name']) or opt['default'])
+                    self.get_module_option(opt['name']))
             self.log.debug(' mgr option %s = %s',
                            opt['name'], getattr(self, opt['name']))
         # Do the same for the native options.

diff --git a/src/pybind/mgr/crash/module.py b/src/pybind/mgr/crash/module.py
index 3f4ee67986e2370cd13c54a3e58210cad52061f6..56340dc7f608abf3ba194d0387e13b747edeb602 100644 (file)
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -53,7 +53,7 @@ class Module(MgrModule):
         for opt in self.MODULE_OPTIONS:
             setattr(self,
                     opt['name'],
-                    self.get_module_option(opt['name']) or opt['default'])
+                    self.get_module_option(opt['name']))
             self.log.debug(' mgr option %s = %s',
                            opt['name'], getattr(self, opt['name']))
 

diff --git a/src/pybind/mgr/diskprediction_cloud/module.py b/src/pybind/mgr/diskprediction_cloud/module.py
index fb918a09102c8d766377f1402740ff62bfd4728f..503d8a88bc26176a92226b25c219cd04d5e8f1f9 100644 (file)
--- a/src/pybind/mgr/diskprediction_cloud/module.py
+++ b/src/pybind/mgr/diskprediction_cloud/module.py
@@ -142,7 +142,7 @@ class Module(MgrModule):
         for opt in self.MODULE_OPTIONS:
             setattr(self,
                     opt['name'],
-                    self.get_module_option(opt['name']) or opt['default'])
+                    self.get_module_option(opt['name']))
             self.log.debug(' %s = %s', opt['name'], getattr(self, opt['name']))
         if not self._activated_cloud and self.get_ceph_option('device_failure_prediction_mode') == 'cloud':
             self._event.set()

diff --git a/src/pybind/mgr/diskprediction_local/module.py b/src/pybind/mgr/diskprediction_local/module.py
index 191b25cdb468fd3b221a51ba28ad9dcd01b5d787..cb69915f541579fe6c646d36a04688383eed913e 100644 (file)
--- a/src/pybind/mgr/diskprediction_local/module.py
+++ b/src/pybind/mgr/diskprediction_local/module.py
@@ -42,7 +42,7 @@ class Module(MgrModule):
         for opt in self.MODULE_OPTIONS:
             setattr(self,
                     opt['name'],
-                    self.get_module_option(opt['name']) or opt['default'])
+                    self.get_module_option(opt['name']))
             self.log.debug(' %s = %s', opt['name'], getattr(self, opt['name']))
         if self.get_ceph_option('device_failure_prediction_mode') == 'local':
             self._event.set()

diff --git a/src/pybind/mgr/k8sevents/module.py b/src/pybind/mgr/k8sevents/module.py
index f5f2042fd00f6cfc92fd5b49a88dc87f635ff39c..0c933966da6ff1c1cda55f0a2f9b7f56e2ddfd94 100644 (file)
--- a/src/pybind/mgr/k8sevents/module.py
+++ b/src/pybind/mgr/k8sevents/module.py
@@ -1079,7 +1079,7 @@ class Module(MgrModule):
         for opt in self.MODULE_OPTIONS:
             setattr(self,
                     opt['name'],
-                    self.get_module_option(opt['name']) or opt['default'])
+                    self.get_module_option(opt['name']))
 
         if not self.kubernetes_control:
             # Populate the config

diff --git a/src/pybind/mgr/pg_autoscaler/module.py b/src/pybind/mgr/pg_autoscaler/module.py
index d2202c98661d9c857fbac6ddf76739aef957f7c1..3d5d51759b2879347287f9ad9688826be4aad7fd 100644 (file)
--- a/src/pybind/mgr/pg_autoscaler/module.py
+++ b/src/pybind/mgr/pg_autoscaler/module.py
@@ -113,7 +113,7 @@ class PgAutoscaler(MgrModule):
         for opt in self.MODULE_OPTIONS:
             setattr(self,
                     opt['name'],
-                    self.get_module_option(opt['name']) or opt['default'])
+                    self.get_module_option(opt['name']))
             self.log.debug(' mgr option %s = %s',
                            opt['name'], getattr(self, opt['name']))