From: Sage Weil <sage@newdream.net>
Date: Wed, 8 Dec 2021 12:11:53 +0000 (-0500)
Subject: Merge PR #44162 into master
X-Git-Tag: v17.1.0~282
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1c741b4147fa80c78eb6db0d1485b0a55160bdf9;p=ceph.git

Merge PR #44162 into master

* 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>
---

1c741b4147fa80c78eb6db0d1485b0a55160bdf9
diff --cc src/pybind/mgr/cephadm/module.py
index c968d956e09d7,192bec71ae083..5a11d8884a422
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -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')