config: more config fixes

diff --git a/src/config.cc b/src/config.cc
index b661bead2a2ba7a73437b312cc0a3269cfc0f064..9199c930852440e63fcd653d127510cea1a571a7 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -373,7 +373,7 @@ static struct config_option config_optionsp[] = {
        OPTION(num_mds, 0, INT, 1),
        OPTION(num_osd, 0, INT, 4),
        OPTION(num_client, 0, INT, 1),
-       OPTION(monmap_file, 'M', STR, 0),
+       OPTION(monmap, 'M', STR, 0),
        OPTION(mon_host, 'm', STR, 0),
        OPTION(daemonize, 'd', BOOL, false),
        OPTION(logger, 0, BOOL, true),
@@ -841,8 +841,8 @@ void parse_startup_config_options(std::vector<const char*>& args, const char *mo
        SAFE_SET_ARG_VAL(&g_conf.conf, STR);
     } else if (CMD_EQ("cluster_conf", 'C')) {
        SAFE_SET_ARG_VAL(&g_conf.cluster_conf, STR);
-    } else if (CMD_EQ("monmap_file", 'M')) {
-       SAFE_SET_ARG_VAL(&g_conf.monmap_file, STR);
+    } else if (CMD_EQ("monmap", 'M')) {
+       SAFE_SET_ARG_VAL(&g_conf.monmap, STR);
     } else if (CMD_EQ("bind", 0)) {
       assert_warn(parse_ip_port(args[++i], g_my_addr));
     } else if (CMD_EQ("nodaemon", 'D')) {

diff --git a/src/config.h b/src/config.h
index e44db2f317762952ee9389aa0c39f9f165d9f355..d1eb94790d31734d0763144a91f83163dfe809e7 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -51,7 +51,7 @@ struct md_config_t {
 
   //bool mkfs;
   
-  const char *monmap_file;
+  const char *monmap;
   const char *mon_host;
   bool daemonize;
 

diff --git a/src/mkcephfs b/src/mkcephfs
index aad990b8f0424fccb06a0e902025732daaac1c02..214fe14d6a54f493bc82b0d57a0765f62c274415 100755 (executable)
--- a/src/mkcephfs
+++ b/src/mkcephfs
@@ -13,7 +13,7 @@ else
 fi
 
 usage_exit() {
-    echo "usage: $0 [--allhosts] [-C cluster.conf] [--clobber_old_data] [--mkbtrfs]"
+    echo "usage: $0 [--allhosts] [-c cluster.conf] [--clobber_old_data] [--mkbtrfs]"
     exit
 }
 
@@ -42,7 +42,7 @@ case $1 in
     --mkbtrfs)
            mkbtrfs=1
            ;;
-    --cluster-conf | -C)
+    --conf | -c)
            [ "$2" == "" ] && usage_exit
            shift
            conf=$1
@@ -117,8 +117,6 @@ for name in $what; do
 
     check_host || continue
 
-    get_conf runtimeconf "$runtime_conf" "conf"
-
     if [[ $ssh != "" ]] && [[ ! $pushed_to =~ " $host " ]]; then
        scp $osdmap $host:$osdmap
        scp $monmap $host:$monmap
@@ -127,12 +125,12 @@ for name in $what; do
 
     if [[ $type = "mon" ]]; then
        get_conf mon_data "" "mon data"
-       do_cmd "$BINDIR/mkmonfs $clobber $mon_data --mon $num --monmap $monmap --osdmap $osdmap"
+       do_cmd "$BINDIR/mkmonfs $clobber --mon-data $mon_data -i $num --monmap $monmap --osdmap $osdmap"
     fi
 
     if [[ $type = "osd" ]]; then
-       get_conf osd_path "" "osd data"
-       get_conf btrfs_path "$osd_path" "btrfs path"  # mount point defaults so osd path
+       get_conf osd_data "" "osd data"
+       get_conf btrfs_path "$osd_data" "btrfs path"  # mount point defaults so osd data
        get_conf btrfs_devs "" "btrfs devs"
        first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
        
@@ -141,7 +139,7 @@ for name in $what; do
        fi
 
        [[ $ssh != "" ]] && scp $monmap $host:$monmap
-       do_cmd "$BINDIR/cosd -c $runtimeconf --monmap_file $monmap --mkfs_for_osd $num $osd_path"
+       do_cmd "$BINDIR/cosd -c $conf --monmap $monmap -i $num --mkfs --osd-data $osd_data"
     fi
 
     if [[ $type = "mds" ]]; then

diff --git a/src/mkmonfs.cc b/src/mkmonfs.cc
index 9b0635ababb7c01a88ec4fcca8f8c6449c5ff4e1..f32a7b0856f7e544f2939f4e7dc5200840658160 100644 (file)
--- a/src/mkmonfs.cc
+++ b/src/mkmonfs.cc
@@ -23,7 +23,7 @@
 
 void usage() 
 {
-  cerr << "usage: ./mkmonfs [--clobber] <monfs dir> --mon <monid> --monmap <file> --osdmap <file>" << std::endl;
+  cerr << "usage: ./mkmonfs [--clobber] --mon-data <monfsdir> -i <monid> --monmap <file> --osdmap <file>" << std::endl;
   exit(1);
 }
 
@@ -41,13 +41,15 @@ int main(int argc, const char **argv)
   for (unsigned i = 0; i < args.size(); i++) {
     if (strcmp(args[i], "--clobber") == 0)
       clobber = true;
-    else if (strcmp(args[i], "--mon") == 0)
+    else if (strcmp(args[i], "--mon") == 0 ||
+            strcmp(args[i], "-i") == 0)
       whoami = atoi(args[++i]);
     else if (strcmp(args[i], "--monmap") == 0) 
       monmapfn = args[++i];
     else if (strcmp(args[i], "--osdmap") == 0) 
       osdmapfn = args[++i];
-    else if (!fsdir)
+    else if (strcmp(args[i], "--mon_data") == 0 ||
+            strcmp(args[i], "--mon-data") == 0)
       fsdir = args[i];
     else 
       usage();

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 8a1bf9ac5bf34c13c72c3a8cb0efe20fe1957d05..12e13d2c822d04b1931b628d8ada21ff799f4e60 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -83,9 +83,9 @@ int MonClient::get_monmap(MonMap *pmonmap)
 {
   static string monstr;
 
-  if (g_conf.monmap_file) {
+  if (g_conf.monmap) {
     // file?
-    const char *monmap_fn = g_conf.monmap_file;
+    const char *monmap_fn = g_conf.monmap;
     int r = pmonmap->read(monmap_fn);
     if (r >= 0) {
       cout << "[opened monmap at " << monmap_fn << " fsid " << pmonmap->fsid << "]" << std::endl;

diff --git a/src/vstart.sh b/src/vstart.sh
index 3d7f6c3702d02d87b8db65a79033876e546f3830..175d16b81e9e2b0cb2e2baae9738ceebf17282af 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -183,33 +183,42 @@ fi
 
 #osd
 if [ $start_osd -eq 1 ]; then
-       for osd in `seq 0 $((CEPH_NUM_OSD-1))`
-       do
-               if [ $new -eq 1 ]; then
-                   cat <<EOF >> $conf
+    for osd in `seq 0 $((CEPH_NUM_OSD-1))`
+    do
+       if [ $new -eq 1 ]; then
+           cat <<EOF >> $conf
 [osd$osd]
         osd data = dev/osd$osd
 EOF
-                       echo mkfs osd$osd
-                       $SUDO $CEPH_BIN/cosd -i $osd $ARGS --mkfs # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
-               fi
-               echo start osd$osd
-               $valgrind $SUDO $CEPH_BIN/cosd -p out/osd$f.pid -m $IP:$CEPH_PORT -i $osd $ARGS $COSD_ARGS
-       done
+           echo mkfs osd$osd
+           echo $SUDO $CEPH_BIN/cosd -i $osd $ARGS --mkfs # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
+           $SUDO $CEPH_BIN/cosd -i $osd $ARGS --mkfs # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
+       fi
+       echo start osd$osd
+       echo $valgrind $SUDO $CEPH_BIN/cosd -i $osd $ARGS $COSD_ARGS
+       $valgrind $SUDO $CEPH_BIN/cosd -i $osd $ARGS $COSD_ARGS
+    done
 fi
 
 # mds
 if [ $start_mds -eq 1 ]; then
-       for mds in `seq 0 $((CEPH_NUM_MDS-1))`
-       do
-               $valgrind $CEPH_BIN/cmds -i $mds $ARGS $CMDS_ARGS
-
+    for mds in `seq 0 $((CEPH_NUM_MDS-1))`
+    do
+       if [ $new -eq 1 ]; then
+           cat <<EOF >> $conf
+[mds$mds]
+EOF
+       fi
+       
+       echo $valgrind $CEPH_BIN/cmds -i $mds $ARGS $CMDS_ARGS
+       $valgrind $CEPH_BIN/cmds -i $mds $ARGS $CMDS_ARGS
+       
 #valgrind --tool=massif $CEPH_BIN/cmds $ARGS --mds_log_max_segments 2 --mds_thrash_fragments 0 --mds_thrash_exports 0 > m  #--debug_ms 20
 #$CEPH_BIN/cmds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20
 #$CEPH_BIN/ceph mds set_max_mds 2
-       done
-       echo $CEPH_BIN/ceph mds set_max_mds $CEPH_NUM_MDS
-       $CEPH_BIN/ceph mds set_max_mds $CEPH_NUM_MDS
+    done
+    echo $CEPH_BIN/ceph mds set_max_mds $CEPH_NUM_MDS
+    $CEPH_BIN/ceph mds set_max_mds $CEPH_NUM_MDS
 fi
 
 echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."