Skip to content

Commit f34b439

Browse files
committed
Merge PR ceph#56047 into main
* refs/pull/56047/head: mgr: process map before notifying clients Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 parents b71803b + 190f379 commit f34b439

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/mgr/Mgr.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,16 +588,16 @@ bool Mgr::ms_dispatch2(const ref_t<Message>& m)
588588
handle_mgr_digest(ref_cast<MMgrDigest>(m));
589589
break;
590590
case CEPH_MSG_MON_MAP:
591+
/* MonClient passthrough of MonMap to us */
592+
handle_mon_map(); /* use monc's monmap */
591593
py_module_registry->notify_all("mon_map", "");
592-
handle_mon_map();
593594
break;
594595
case CEPH_MSG_FS_MAP:
595-
py_module_registry->notify_all("fs_map", "");
596596
handle_fs_map(ref_cast<MFSMap>(m));
597+
py_module_registry->notify_all("fs_map", "");
597598
return false; // I shall let this pass through for Client
598599
case CEPH_MSG_OSD_MAP:
599600
handle_osd_map();
600-
601601
py_module_registry->notify_all("osd_map", "");
602602

603603
// Continuous subscribe, so that we can generate notifications

0 commit comments

Comments
 (0)