]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #44162 into master
authorSage Weil <sage@newdream.net>
Wed, 8 Dec 2021 12:11:53 +0000 (07:11 -0500)
committerSage Weil <sage@newdream.net>
Wed, 8 Dec 2021 12:11:53 +0000 (07:11 -0500)
* refs/pull/44162/head:
mgr: only queue notify events that modules ask for
pybind/mgr: annotate which events modules consume
pybind/mgr: introduce NotifyType enum
mgr: stop issuing events that no modules consume

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
1  2 
src/mgr/ActivePyModules.cc
src/mgr/DaemonServer.cc
src/mgr/Mgr.cc
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
index c968d956e09d76bb9d3fa9d6062d06faa2c8a567,192bec71ae08365e2783bb071cc3e7153f6ad0b0..5a11d8884a422ca4f4c56c9340485ef053d3500d
@@@ -433,9 -434,8 +434,9 @@@ class CephadmOrchestrator(orchestrator.
              self.agent_starting_port = 0
              self.apply_spec_fails: List[Tuple[str, str]] = []
              self.max_osd_draining_count = 10
 +            self.device_enhanced_scan = False
  
-         self.notify('mon_map', None)
+         self.notify(NotifyType.mon_map, None)
          self.config_notify()
  
          path = self.get_ceph_option('cephadm_path')