From 382290ef2ef0ce54140ab46d6b456a5559318902 Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 8 Jul 2010 15:51:07 -0700
Subject: [PATCH] messages: add cluster_addr to MOSDBoot, use it in OSD and
 OSDMonitor

---
 src/messages/MOSDBoot.h | 12 +++++++++++-
 src/mon/OSDMonitor.cc   |  4 ++++
 src/osd/OSD.cc          |  5 ++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index c3ab135751714..6e98184d86d0e 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -24,12 +24,18 @@ class MOSDBoot : public PaxosServiceMessage {
  public:
   OSDSuperblock sb;
   entity_addr_t hb_addr;
+  entity_addr_t cluster_addr;
 
   MOSDBoot() : PaxosServiceMessage( MSG_OSD_BOOT, 0){}
   MOSDBoot(OSDSuperblock& s, entity_addr_t& hb_addr_ref) : 
     PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch),
-    sb(s), hb_addr(hb_addr_ref) {
+    sb(s), hb_addr(hb_addr_ref), cluster_addr() {
   }
+  MOSDBoot(OSDSuperblock& s, entity_addr_t& hb_addr_ref,
+           entity_addr_t& cluster_addr_ref) :
+             PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch),
+             sb(s), hb_addr(hb_addr_ref), cluster_addr(cluster_addr_ref) {}
+
 private:
   ~MOSDBoot() {}
 
@@ -40,15 +46,19 @@ public:
   }
   
   void encode_payload() {
+    header.version = 1;
     paxos_encode();
     ::encode(sb, payload);
     ::encode(hb_addr, payload);
+    ::encode(cluster_addr, payload);
   }
   void decode_payload() {
     bufferlist::iterator p = payload.begin();
     paxos_decode(p);
     ::decode(sb, p);
     ::decode(hb_addr, p);
+    if (header.version >=1)
+      ::decode(cluster_addr, p);
   }
 };
 
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 48a3d59b143c5..064fbbf18a1f9 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -482,6 +482,10 @@ bool OSDMonitor::prepare_boot(MOSDBoot *m)
     pending_inc.new_up_client[from] = m->get_orig_source_addr(); //FIXME: should this be using new_up_client?
     pending_inc.new_hb_up[from] = m->hb_addr;
     
+    if (!m->cluster_addr.is_blank_addr()) { //is there a cluster addr?
+      pending_inc.new_up_internal[from] = m->cluster_addr; //fill it in!
+    }
+
     // mark in?
     pending_inc.new_weight[from] = CEPH_OSD_IN;
 
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a514608146c8c..8e73ed1917c6b 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1527,7 +1527,10 @@ void OSD::send_boot()
     hb_addr = cluster_messenger->get_myaddr();
     hb_addr.set_port(port);
   }
-  monc->send_mon_message(new MOSDBoot(superblock, hb_addr));
+  MOSDBoot *mboot = new MOSDBoot(superblock, hb_addr);
+  if (cluster_messenger != client_messenger)
+    mboot->cluster_addr = cluster_messenger->get_myaddr();
+  monc->send_mon_message(mboot);
 }
 
 void OSD::queue_want_up_thru(epoch_t want)
-- 
2.39.5