From 3ab9358bb7a22646c1a76506b6d595703ce88c00 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Thu, 5 Oct 2006 06:05:52 +0000
Subject: [PATCH] other binaries working.  minor mon tweaks.

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@917 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/cfuse.cc      | 25 ++++++++++++++++++-------
 ceph/cosd.cc       | 14 +++++++++-----
 ceph/fakefuse.cc   | 14 ++++++--------
 ceph/fakesyn.cc    |  2 +-
 ceph/mon/MonMap.h  |  3 +++
 ceph/mon/Monitor.h |  2 +-
 ceph/newsyn.cc     |  2 +-
 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/ceph/cfuse.cc b/ceph/cfuse.cc
index 199e00eb8bca2..e16763acacfe1 100644
--- a/ceph/cfuse.cc
+++ b/ceph/cfuse.cc
@@ -20,7 +20,6 @@ using namespace std;
 
 #include "config.h"
 
-#include "mds/MDCluster.h"
 #include "mds/MDS.h"
 #include "osd/OSD.h"
 #include "client/Client.h"
@@ -46,14 +45,26 @@ int main(int argc, char **argv, char *envp[]) {
   // args for fuse
   vec_to_argv(args, argc, argv);
 
-  // start up messenger
-  tcpaddr_t nsa;
-  if (rank.find_ns_addr(nsa) < 0) exit(1);
-  cout << "ns is at " << nsa << endl;
-  rank.start_rank(nsa);
+  // load monmap
+  bufferlist bl;
+  int fd = ::open(".ceph_monmap", O_RDONLY);
+  assert(fd >= 0);
+  struct stat st;
+  ::fstat(fd, &st);
+  bufferptr bp = new buffer(st.st_size);
+  bl.append(bp);
+  ::read(fd, (void*)bl.c_str(), bl.length());
+  ::close(fd);
+  
+  MonMap *monmap = new MonMap;
+  monmap->decode(bl);
+
+  // start up network
+  rank.set_namer(monmap->get_inst(0).addr);
+  rank.start_rank();
 
   // start client
-  Client *client = new Client(rank.register_entity(MSG_ADDR_CLIENT_NEW));
+  Client *client = new Client(rank.register_entity(MSG_ADDR_CLIENT_NEW), monmap);
   client->init();
     
   // start up fuse
diff --git a/ceph/cosd.cc b/ceph/cosd.cc
index 9eb131161767a..b7d27f230506b 100644
--- a/ceph/cosd.cc
+++ b/ceph/cosd.cc
@@ -11,6 +11,9 @@
  * 
  */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include <sys/stat.h>
 #include <iostream>
@@ -69,7 +72,7 @@ int main(int argc, char **argv)
   ObjectStore *store = new Ebofs(dev);
   bufferlist bl;
   store->mount();
-  int r = store->read(0, 0, sizeof(sb), bl);
+  int r = store->read(object_t(0,0), 0, sizeof(sb), bl);
   if (r < 0) {
     cerr << "couldn't read superblock object on " << dev << endl;
     exit(0);
@@ -80,9 +83,9 @@ int main(int argc, char **argv)
 
   cout << "osd fs says i am osd" << sb.whoami << endl;
 
-  // start up messenger
-  bufferlist bl;
-  int fd = open(".ceph_monmap", O_RDONLY);
+  // load monmap
+  bl.clear();
+  int fd = ::open(".ceph_monmap", O_RDONLY);
   assert(fd >= 0);
   struct stat st;
   ::fstat(fd, &st);
@@ -90,10 +93,11 @@ int main(int argc, char **argv)
   bl.append(bp);
   ::read(fd, (void*)bl.c_str(), bl.length());
   ::close(fd);
-
+  
   MonMap *monmap = new MonMap;
   monmap->decode(bl);
 
+  // start up network
   rank.set_namer(monmap->get_inst(0).addr);
   rank.start_rank();
 
diff --git a/ceph/fakefuse.cc b/ceph/fakefuse.cc
index 4a9f7a051c0f0..874234c6545fa 100644
--- a/ceph/fakefuse.cc
+++ b/ceph/fakefuse.cc
@@ -19,7 +19,6 @@
 using namespace std;
 
 #include "config.h"
-#include "mds/MDCluster.h"
 
 #include "mon/Monitor.h"
 
@@ -63,8 +62,6 @@ int main(int argc, char **argv) {
   argv_to_vec(argc, argv, args);
   parse_config_options(args);
 
-  MDCluster *mdc = new MDCluster(NUMMDS, NUMOSD);
-
   // start messenger thread
   fakemessenger_startthread();
 
@@ -78,21 +75,23 @@ int main(int argc, char **argv) {
   args = nargs;
   vec_to_argv(args, argc, argv);
 
+  MonMap *monmap = new MonMap;
+
   Monitor *mon[g_conf.num_mon];
   for (int i=0; i<g_conf.num_mon; i++) {
-    mon[i] = new Monitor(i, new FakeMessenger(MSG_ADDR_MON(i)));
+    mon[i] = new Monitor(i, new FakeMessenger(MSG_ADDR_MON(i)), monmap);
   }
 
   // create osd
   OSD *osd[NUMOSD];
   for (int i=0; i<NUMOSD; i++) {
-    osd[i] = new OSD(i, new FakeMessenger(MSG_ADDR_OSD(i)));
+    osd[i] = new OSD(i, new FakeMessenger(MSG_ADDR_OSD(i)), monmap);
   }
 
   // create mds
   MDS *mds[NUMMDS];
   for (int i=0; i<NUMMDS; i++) {
-    mds[i] = new MDS(mdc, i, new FakeMessenger(MSG_ADDR_MDS(i)));
+    mds[i] = new MDS(i, new FakeMessenger(MSG_ADDR_MDS(i)), monmap);
   }
  
     // init
@@ -111,7 +110,7 @@ int main(int argc, char **argv) {
   // create client
   Client *client[NUMCLIENT];
   for (int i=0; i<NUMCLIENT; i++) {
-    client[i] = new Client(new FakeMessenger(MSG_ADDR_CLIENT(0)));
+    client[i] = new Client(new FakeMessenger(MSG_ADDR_CLIENT(0)), monmap);
     client[i]->init();
 
 
@@ -142,7 +141,6 @@ int main(int argc, char **argv) {
   for (int i=0; i<NUMCLIENT; i++) {
     delete client[i];
   }
-  delete mdc;
   
   return 0;
 }
diff --git a/ceph/fakesyn.cc b/ceph/fakesyn.cc
index 2126cc9d72ec1..312ad8b345ef8 100644
--- a/ceph/fakesyn.cc
+++ b/ceph/fakesyn.cc
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
   // create mon
   Monitor *mon[g_conf.num_mon];
   for (int i=0; i<g_conf.num_mon; i++) {
-    mon[i] = new Monitor(i, monmap, new FakeMessenger(MSG_ADDR_MON(i)));
+    mon[i] = new Monitor(i, new FakeMessenger(MSG_ADDR_MON(i)), monmap);
   }
 
   // create mds
diff --git a/ceph/mon/MonMap.h b/ceph/mon/MonMap.h
index b706546a9e934..e72946d76cf06 100644
--- a/ceph/mon/MonMap.h
+++ b/ceph/mon/MonMap.h
@@ -14,6 +14,9 @@
 #ifndef __MONMAP_H
 #define __MONMAP_H
 
+#include "msg/Message.h"
+#include "include/types.h"
+
 class MonMap {
  public:
   epoch_t   epoch;       // what epoch of the osd cluster descriptor is this
diff --git a/ceph/mon/Monitor.h b/ceph/mon/Monitor.h
index 877185681735a..dfd69f77b0267 100644
--- a/ceph/mon/Monitor.h
+++ b/ceph/mon/Monitor.h
@@ -55,7 +55,7 @@ protected:
   friend class MDSMonitor;
 
  public:
-  Monitor(int w, MonMap *mm, Messenger *m) : 
+  Monitor(int w, Messenger *m, MonMap *mm) : 
     whoami(w), 
     messenger(m),
     monmap(mm),
diff --git a/ceph/newsyn.cc b/ceph/newsyn.cc
index b5e7f286097ef..b0130156a6fe1 100644
--- a/ceph/newsyn.cc
+++ b/ceph/newsyn.cc
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
   
   // create mon
   if (myrank < g_conf.num_mon) {
-    Monitor *mon = new Monitor(myrank, monmap, rank.register_entity(MSG_ADDR_MON(myrank)));
+    Monitor *mon = new Monitor(myrank, rank.register_entity(MSG_ADDR_MON(myrank)), monmap);
     mon->init();
   }
 
-- 
2.39.5