mon: clean up cluster_addr code a bit, better debug output

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8c48d1ab6da703db555b737f4311abfa8169ebc1..9230d0a8f5278ceba65ab7cac01b63f2c6c92392 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -493,7 +493,9 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
 
 bool OSDMonitor::prepare_boot(MOSDBoot *m)
 {
-  dout(7) << "prepare_boot from " << m->get_orig_source_inst() << " sb " << m->sb << dendl;
+  dout(7) << "prepare_boot from " << m->get_orig_source_inst() << " sb " << m->sb
+         << " cluster_addr " << m->cluster_addr << " hb_addr " << m->hb_addr
+         << dendl;
 
   assert(m->get_orig_source().is_osd());
   int from = m->get_orig_source().num();
@@ -522,13 +524,11 @@ bool OSDMonitor::prepare_boot(MOSDBoot *m)
   } else {
     // mark new guy up.
     down_pending_out.erase(from);  // if any
-    pending_inc.new_up_client[from] = m->get_orig_source_addr(); //FIXME: should this be using new_up_client?
+
+    pending_inc.new_up_client[from] = m->get_orig_source_addr();
+    if (!m->cluster_addr.is_blank_addr())
+      pending_inc.new_up_internal[from] = m->cluster_addr;
     pending_inc.new_hb_up[from] = m->hb_addr;
-    
-    if (!m->cluster_addr.is_blank_addr()) { //is there a cluster addr?
-      dout(0) << "setting new_up_internal[" << from << "] to " << m->cluster_addr << dendl;
-      pending_inc.new_up_internal[from] = m->cluster_addr; //fill it in!
-    }
 
     // mark in?
     pending_inc.new_weight[from] = CEPH_OSD_IN;