mon: remove obsolete osdmap bcast

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ceefe0e5e157154ccd3bf92102e00053dc342aa5..2a7c53c456f6f1936d3291401891f05fa41a0131 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -73,10 +73,6 @@ void OSDMonitor::fake_osd_failure(int osd, bool down)
     pending_inc.new_weight[osd] = CEPH_OSD_OUT;
   }
   propose_pending();
-
-  // fixme
-  //bcast_latest_osd();
-  //bcast_latest_mds();
 }
 
 void OSDMonitor::fake_osdmap_update()
@@ -176,8 +172,6 @@ bool OSDMonitor::update_from_paxos()
   if (mon->is_leader()) {
     // kick pgmon, make sure it's seen the latest map
     mon->pgmon()->check_osd_map(osdmap.epoch);
-
-    bcast_latest_mds();
   }
 
   send_to_waiting();
@@ -785,34 +779,6 @@ void OSDMonitor::send_incremental(entity_inst_t dest, epoch_t from)
 }
 
 
-void OSDMonitor::bcast_latest_mds()
-{
-  epoch_t e = osdmap.get_epoch();
-  dout(1) << "bcast_latest_mds epoch " << e << dendl;
-  
-  for (map<entity_addr_t,MDSMap::mds_info_t>::const_iterator p = mon->mdsmon()->mdsmap.get_mds_info().begin();
-       p != mon->mdsmon()->mdsmap.get_mds_info().end();
-       p++)
-    send_incremental(p->second.get_inst(), osdmap.get_epoch());
-}
-
-void OSDMonitor::bcast_latest_osd()
-{
-  epoch_t e = osdmap.get_epoch();
-  dout(1) << "bcast_latest_osd epoch " << e << dendl;
-
-  // tell osds
-  set<int32_t> osds;
-  osdmap.get_all_osds(osds);
-  for (set<int32_t>::iterator it = osds.begin();
-       it != osds.end();
-       it++) {
-    if (osdmap.is_down(*it)) continue;
-    
-    send_incremental(osdmap.get_inst(*it), osdmap.get_epoch());
-  }  
-}
-
 void OSDMonitor::bcast_full_osd()
 {
   epoch_t e = osdmap.get_epoch();

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 9213a7c9a2e636ab1463eb7484433fef57062efc..f5ac78e1b7a7f02dadda88ff5a3291ac84273c2d 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -68,8 +68,6 @@ private:
   void send_to_waiting();     // send current map to waiters.
   void send_full(entity_inst_t dest);
   void send_incremental(entity_inst_t dest, epoch_t since);
-  void bcast_latest_mds();
-  void bcast_latest_osd();
   void bcast_full_osd();
  
   void handle_osd_getmap(class MOSDGetMap *m);