From 11ee8ab6b186c364f5cf892baa33ea9905ea7744 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 11 Mar 2009 14:58:58 -0700
Subject: [PATCH] config: fix mds, mon, osd startup

---
 src/cmds.cc   | 18 ++++++--------
 src/cmon.cc   | 33 +++++++++++++------------
 src/config.cc |  8 ++++++
 src/config.h  |  3 +++
 src/cosd.cc   | 68 +++++++++++++++++++++++++--------------------------
 src/mds/MDS.h |  2 +-
 6 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/src/cmds.cc b/src/cmds.cc
index 626fd75eb069d..a9e3d4d7ec67e 100644
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -35,7 +35,7 @@ using namespace std;
 
 void usage()
 {
-  cerr << "usage: cmds name [flags] [--mds rank] [--shadow rank]\n";
+  cerr << "usage: cmds -i name [flags] [--mds rank] [--shadow rank]\n";
   cerr << "  -m monitorip:port\n";
   cerr << "        connect to monitor at given address\n";
   cerr << "  --debug_mds n\n";
@@ -52,18 +52,14 @@ int main(int argc, const char **argv)
   common_init(args, "mds");
 
   // mds specific args
-  const char *name = 0;
   for (unsigned i=0; i<args.size(); i++) {
-    if (!name)
-      name = args[i];
-    else {
-      cerr << "unrecognized arg " << args[i] << std::endl;
-      usage();
-      return -1;
-    }
+    cerr << "unrecognized arg " << args[i] << std::endl;
+    usage();
   }
-  if (!name)
+  if (!g_conf.id) {
+    cerr << "must specify '-i name' with the cmds instance name" << std::endl;
     usage();
+  }
 
   if (g_conf.clock_tare) g_clock.tare();
 
@@ -89,7 +85,7 @@ int main(int argc, const char **argv)
   rank.start();
   
   // start mds
-  MDS *mds = new MDS(name, m, &monmap);
+  MDS *mds = new MDS(g_conf.id, m, &monmap);
   mds->init();
   
   rank.wait();
diff --git a/src/cmon.cc b/src/cmon.cc
index b6889f142ecbd..610e2cb749bfe 100644
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -36,7 +36,7 @@ using namespace std;
 
 void usage()
 {
-  cerr << "usage: cmon [flags] <monfsdir>" << std::endl;
+  cerr << "usage: cmon -i monid [--mon-data=pathtodata] [flags]" << std::endl;
   cerr << "  --debug_mon n\n";
   cerr << "        debug monitor level (e.g. 10)\n";
   generic_server_usage();
@@ -52,26 +52,25 @@ int main(int argc, const char **argv)
   configure_daemon_mode();
   common_init(args, "mon");
 
-  // args
-  const char *fsdir = 0;
-  for (unsigned i=0; i<args.size(); i++) {
-    if (args[i][0] != '-') {
-      if (!fsdir)
-        fsdir = args[i];
-      else if (fsdir)
-        usage();
-    }
+  // whoami
+  char *end;
+  int whoami = strtol(g_conf.id, &end, 10);
+  if (*end || end == g_conf.id || whoami < 0) {
+    cerr << "must specify '-i #' where # is the osd number" << std::endl;
+    usage();
   }
 
-  if (!fsdir)
+  if (!g_conf.mon_data) {
+    cerr << "must specify '--mon-data=foo' data path" << std::endl;
     usage();
+  }
 
   if (g_conf.clock_tare) g_clock.tare();
 
-  MonitorStore store(fsdir);
+  MonitorStore store(g_conf.mon_data);
   err = store.mount();
   if (err < 0) {
-    cerr << "problem opening monitor store in " << fsdir << ": " << strerror(-err) << std::endl;
+    cerr << "problem opening monitor store in " << g_conf.mon_data << ": " << strerror(-err) << std::endl;
     exit(1);
   }
 
@@ -80,7 +79,11 @@ int main(int argc, const char **argv)
     cerr << "mon fs missing 'whoami'" << std::endl;
     exit(1);
   }
-  int whoami = store.get_int("whoami");
+  int w = store.get_int("whoami");
+  if (w != whoami) {
+    cerr << "monitor data is for mon" << w << ", but you said i was mon" << whoami << std::endl;
+    exit(1);
+  }
 
   bufferlist magicbl;
   store.get_bl_ss(magicbl, "magic", 0);
@@ -108,7 +111,7 @@ int main(int argc, const char **argv)
   // bind
   cout << "starting mon" << whoami 
        << " at " << monmap.get_inst(whoami).addr
-       << " from " << fsdir << std::endl;
+       << " from " << g_conf.mon_data << std::endl;
   g_my_addr = monmap.get_inst(whoami).addr;
   err = rank.bind();
   if (err < 0)
diff --git a/src/config.cc b/src/config.cc
index 328e6020b23d7..63237b966aa8d 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -422,6 +422,7 @@ static struct config_option config_optionsp[] = {
 	OPTION(ms_fail_interval, 0, DOUBLE, 15.0),  // fail after this long
 	OPTION(ms_die_on_failure, 0, BOOL, false),
 	OPTION(ms_nocrc, 0, BOOL, false),
+	OPTION(mon_data, 0, STR, ""),
 	OPTION(mon_tick_interval, 0, INT, 5),
 	OPTION(mon_osd_down_out_interval, 0, INT, 5),  // seconds
 	OPTION(mon_lease, 0, FLOAT, 5),  		    // lease interval
@@ -521,6 +522,8 @@ static struct config_option config_optionsp[] = {
 	OPTION(mds_dump_cache_on_map, 0, BOOL, false),
 	OPTION(mds_dump_cache_after_rejoin, 0, BOOL, true),
 	OPTION(mds_hack_log_expire_for_better_stats, 0, BOOL, false),
+	OPTION(osd_data, 0, STR, ""),
+	OPTION(osd_journal, 0, STR, ""),
 	OPTION(osd_balance_reads, 0, BOOL, false),
 	OPTION(osd_flash_crowd_iat_threshold, 0, INT, 0),
 	OPTION(osd_flash_crowd_iat_alpha, 0, DOUBLE, 0.125),
@@ -792,6 +795,11 @@ void parse_startup_config_options(std::vector<const char*>& args, const char *mo
   unsigned int val_pos;
 
   std::vector<const char*> nargs;
+  
+  if (!g_conf.id)
+    g_conf.id = (char *)"";
+  if (!g_conf.type)
+    g_conf.type = (char *)"";
 
   for (unsigned i=0; i<args.size(); i++) {
     bool isarg = i+1 < args.size();  // is more?
diff --git a/src/config.h b/src/config.h
index 3247ffbdf5dd0..e44db2f317762 100644
--- a/src/config.h
+++ b/src/config.h
@@ -125,6 +125,7 @@ struct md_config_t {
   bool ms_nocrc;
 
   // mon
+  const char *mon_data;
   int mon_tick_interval;
   int mon_osd_down_out_interval;
   float mon_lease;
@@ -249,6 +250,8 @@ struct md_config_t {
   bool mds_hack_log_expire_for_better_stats;
 
   // osd
+  const char *osd_data;
+  const char *osd_journal;
   bool osd_balance_reads;
   int osd_flash_crowd_iat_threshold;  // flash crowd interarrival time threshold in ms
   double osd_flash_crowd_iat_alpha;
diff --git a/src/cosd.cc b/src/cosd.cc
index ff6612b5e6977..3b280ead04ddc 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -36,7 +36,7 @@ using namespace std;
 
 void usage() 
 {
-  cerr << "usage: cosd <device> [-j journalfileordev] [-m monitor] [--mkfs_for_osd <nodeid>]" << std::endl;
+  cerr << "usage: cosd -i osdid [--osd-data=path] [--osd-journal=path] [--mkfs]" << std::endl;
   cerr << "   --debug_osd N   set debug level (e.g. 10)" << std::endl;
   generic_server_usage();
 }
@@ -53,29 +53,26 @@ int main(int argc, const char **argv)
   if (g_conf.clock_tare) g_clock.tare();
 
   // osd specific args
-  const char *dev = 0, *journaldev = 0;
-  int whoami = -1;
   bool mkfs = 0;
   for (unsigned i=0; i<args.size(); i++) {
-    if (strcmp(args[i],"--mkfs_for_osd") == 0) {
+    if (strcmp(args[i],"--mkfs") == 0)
       mkfs = 1; 
-      whoami = atoi(args[++i]);
-    } else if (strcmp(args[i],"-j") == 0)
-      journaldev = args[++i];
-    else if (!dev)
-      dev = args[i];
     else {
       cerr << "unrecognized arg " << args[i] << std::endl;
       usage();
     }
   }
-  if (!dev) {
-    cerr << "must specify device file" << std::endl;
+
+  // whoami
+  char *end;
+  int whoami = strtol(g_conf.id, &end, 10);
+  if (*end || end == g_conf.id || whoami < 0) {
+    cerr << "must specify '-i #' where # is the osd number" << std::endl;
     usage();
   }
 
-  if (mkfs && whoami < 0) {
-    cerr << "must specify '--osd #' where # is the osd number" << std::endl;
+  if (!g_conf.osd_data) {
+    cerr << "must specify '--osd-data=foo' data path" << std::endl;
     usage();
   }
 
@@ -86,31 +83,34 @@ int main(int argc, const char **argv)
     return -1;
 
   if (mkfs) {
-    int err = OSD::mkfs(dev, journaldev, monmap.fsid, whoami);
+    int err = OSD::mkfs(g_conf.osd_data, g_conf.osd_journal, monmap.fsid, whoami);
     if (err < 0) {
-      cerr << "error creating empty object store in " << dev << ": " << strerror(-err) << std::endl;
+      cerr << "error creating empty object store in " << g_conf.osd_data << ": " << strerror(-err) << std::endl;
       exit(1);
     }
-    cout << "created object store for osd" << whoami << " fsid " << monmap.fsid << " on " << dev << std::endl;
+    cout << "created object store for osd" << whoami << " fsid " << monmap.fsid << " on " << g_conf.osd_data << std::endl;
     exit(0);
   }
 
-  if (whoami < 0) {
-    nstring magic;
-    ceph_fsid_t fsid;
-    int r = OSD::peek_super(dev, magic, fsid, whoami);
-    if (r < 0) {
-      cerr << "unable to determine OSD identity from superblock on " << dev << ": " << strerror(-r) << std::endl;
-      exit(1);
-    }
-    if (strcmp(magic.c_str(), CEPH_OSD_ONDISK_MAGIC)) {
-      cerr << "OSD magic " << magic << " != my " << CEPH_OSD_ONDISK_MAGIC << std::endl;
-      exit(1);
-    }
-    if (ceph_fsid_compare(&fsid, &monmap.fsid)) {
-      cerr << "OSD fsid " << fsid << " != monmap fsid " << monmap.fsid << std::endl;
-      exit(1);
-    }
+  nstring magic;
+  ceph_fsid_t fsid;
+  int w;
+  int r = OSD::peek_super(g_conf.osd_data, magic, fsid, w);
+  if (r < 0) {
+    cerr << "unable to open OSD superblock on " << g_conf.osd_data << ": " << strerror(-r) << std::endl;
+    exit(1);
+  }
+  if (w != whoami) {
+    cerr << "OSD id " << w << " != my id " << whoami << std::endl;
+    exit(1);
+  }
+  if (strcmp(magic.c_str(), CEPH_OSD_ONDISK_MAGIC)) {
+    cerr << "OSD magic " << magic << " != my " << CEPH_OSD_ONDISK_MAGIC << std::endl;
+    exit(1);
+  }
+  if (ceph_fsid_compare(&fsid, &monmap.fsid)) {
+    cerr << "OSD fsid " << fsid << " != monmap fsid " << monmap.fsid << std::endl;
+    exit(1);
   }
 
   _dout_create_courtesy_output_symlink("osd", whoami);
@@ -121,7 +121,7 @@ int main(int argc, const char **argv)
 
   cout << "starting osd" << whoami
        << " at " << rank.get_rank_addr() 
-       << " dev " << dev << " " << (journaldev ? journaldev:"")
+       << " dev " << g_conf.osd_data << " " << (g_conf.osd_journal ? g_conf.osd_journal:"")
        << " fsid " << monmap.fsid
        << std::endl;
 
@@ -148,7 +148,7 @@ int main(int argc, const char **argv)
   rank.start();
 
   // start osd
-  OSD *osd = new OSD(whoami, m, hbm, &monmap, dev, journaldev);
+  OSD *osd = new OSD(whoami, m, hbm, &monmap, g_conf.osd_data, g_conf.osd_journal);
   if (osd->init() < 0) {
     cout << "error initializing osd" << std::endl;
     return 1;
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 935edbe2516a0..4e80ed8e68cf0 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -121,9 +121,9 @@ class MDS : public Dispatcher {
   int whoami;
   int incarnation;
   
-  int standby_replay_for;
   int standby_for_rank;
   string standby_for_name;
+  int standby_replay_for;
 
   Messenger    *messenger;
   MonMap       *monmap;
-- 
2.39.5