From fa5e6eb9f63d650e8376f1558ae757073ce7b4cb Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Thu, 1 Mar 2007 16:36:23 +0000
Subject: [PATCH] newsyn fix for numclients>1, mds_beacon_* args for config.cc,
 simplemessenger now dies on dup register_entity, doesn't assert on missing
 local destination (still warns)

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1147 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/config.cc              | 5 +++++
 trunk/ceph/msg/SimpleMessenger.cc | 3 ++-
 trunk/ceph/newsyn.cc              | 7 ++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/trunk/ceph/config.cc b/trunk/ceph/config.cc
index b164218d81a8e..28bfee898f398 100644
--- a/trunk/ceph/config.cc
+++ b/trunk/ceph/config.cc
@@ -562,6 +562,11 @@ void parse_config_options(std::vector<char*>& args)
     else if (strcmp(args[i], "--mds_cache_size") == 0) 
       g_conf.mds_cache_size = atoi(args[++i]);
 
+    else if (strcmp(args[i], "--mds_beacon_interval") == 0) 
+      g_conf.mds_beacon_interval = atoi(args[++i]);
+    else if (strcmp(args[i], "--mds_beacon_grace") == 0) 
+      g_conf.mds_beacon_grace = atoi(args[++i]);
+
     else if (strcmp(args[i], "--mds_log") == 0) 
       g_conf.mds_log = atoi(args[++i]);
     else if (strcmp(args[i], "--mds_log_before_reply") == 0) 
diff --git a/trunk/ceph/msg/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc
index ec19e41bb4581..5bb9e84d188d6 100644
--- a/trunk/ceph/msg/SimpleMessenger.cc
+++ b/trunk/ceph/msg/SimpleMessenger.cc
@@ -858,6 +858,7 @@ Rank::EntityMessenger *Rank::register_entity(entity_name_t name)
   EntityMessenger *msgr = new EntityMessenger(name);
 
   // add to directory
+  assert(local.count(name) == 0);
   local[name] = msgr;
   
   lock.Unlock();
@@ -904,7 +905,7 @@ void Rank::submit_message(Message *m, const entity_addr_t& dest_addr)
         }
       } else {
         derr(0) << "submit_message " << *m << " dest " << dest << " " << dest_addr << " local but not in local map?" << endl;
-        assert(0);  // hmpf
+        //assert(0);  // hmpf, this is probably mds->mon beacon from newsyn.
       }
     }
     else {
diff --git a/trunk/ceph/newsyn.cc b/trunk/ceph/newsyn.cc
index 84f37bf693da4..82292033fa062 100644
--- a/trunk/ceph/newsyn.cc
+++ b/trunk/ceph/newsyn.cc
@@ -287,6 +287,7 @@ int main(int argc, char **argv)
   set<int> clientlist;
   map<int,Client *> client;//[NUMCLIENT];
   map<int,SyntheticClient *> syn;//[NUMCLIENT];
+  int nclients = 0;
   for (int i=0; i<NUMCLIENT; i++) {
     //if (myrank != NUMMDS + NUMOSD + i % client_nodes) continue;
     if (myrank != g_conf.ms_skip_rank0+NUMMDS + skip_osd + i / clients_per_node) continue;
@@ -321,21 +322,21 @@ int main(int argc, char **argv)
     started++;
 
     syn[i] = new SyntheticClient(client[i]);
+
+    client[i]->mount();
+    nclients++;
   }
 
   if (!clientlist.empty()) dout(2) << "i have " << clientlist << endl;
 
-  int nclients = 0;
   for (set<int>::iterator it = clientlist.begin();
        it != clientlist.end();
        it++) {
     int i = *it;
 
     //cerr << "starting synthetic client" << i << " on rank " << myrank << endl;
-    client[i]->mount();
     syn[i]->start_thread();
     
-    nclients++;
   }
   if (nclients) {
     cerr << nclients << " clients  at " << rank.my_addr << " " << hostname << "." << pid << endl;
-- 
2.39.5