mds: fix up startup options

diff --git a/man/cmds.8 b/man/cmds.8
index 5d2e346e8d305b29cb170bc7e0f23eb7ba0b2054..d0c9d94280945984af60c6a93e612e30f1f8055f 100644 (file)
--- a/man/cmds.8
+++ b/man/cmds.8
@@ -3,16 +3,25 @@
 cmds \- ceph metadata server daemon
 .SH SYNOPSIS
 .B cmds
-[ \fB\-\-mds\fI rank\fP ]
-[ \fB\-\-shadow\fI rank\fP ]
+\fIname\fR
+[ \fB\-\-rank\fI rank\fR ]
+[ \fB\-\-shadow\fI rank\fR ]
 .SH DESCRIPTION
 .B cmds
 is the metadata server daemon for the Ceph distributed file system.
 One or more instances of \fBcmds\fP collectively manage the file system
 namespace, coordinating access to the shared OSD cluster.
 .PP
-If a numerical MDS rank is not specified, \fBcmds\fP will allow the monitor
-cluster to assign its rank.
+Each 
+.B cmds
+daemon instance should have a unique \fIname\fP.  The name is used
+to identify daemon instances in the \fIcluster.conf\fP.
+.PP
+Once the daemon has started, the monitor cluster will normally assign it
+a logical rank, or put it in a standby pool to take over for another daemon
+that crashes.  If a specific rank may be optionally specified on the
+command line, the daemon will be assigned that rank, or will be put in a
+separate standby queue specifically for that rank.
 .SH OPTIONS
 .TP
 \fB\-\-mds\fI rank\fP

diff --git a/src/cmds.cc b/src/cmds.cc
index ca1f242c3062d5451dd606f155ec01b90e0fef7d..0920a59777f4a8fe7516a321edf6893a45322319 100644 (file)
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -56,7 +56,7 @@ int main(int argc, const char **argv)
   int shadow = -1;
   const char *name = 0;
   for (unsigned i=0; i<args.size(); i++) {
-    if (strcmp(args[i], "--mds") == 0) 
+    if (strcmp(args[i], "--rank") == 0) 
       whoami = atoi(args[++i]);
     else if (strcmp(args[i], "--shadow") == 0)
       whoami = shadow = atoi(args[++i]);

diff --git a/src/init-ceph b/src/init-ceph
index 27c60be46586278593de74bc74555a8ff3867258..505c58b571fff32aae0c9857281d9c0aad311593 100755 (executable)
--- a/src/init-ceph
+++ b/src/init-ceph
@@ -150,11 +150,11 @@ for name in $what; do
     fi
 
     if [[ $name =~ "mds" ]]; then
-       get_conf mds "" "mds" $sections
+       get_conf rank "" "rank" $sections
        get_conf shadow "" "shadow" $sections
        module_opt="$mon_addr_arg"
        module_bin="$BINDIR/cmds $id"
-       [[ $mds != "" ]] && $module_bin="$module_bin --mds $mds"
+       [[ $rank != "" ]] && $module_bin="$module_bin --rank $mds"
        [[ $shadow != "" ]] && $module_bin="$module_bin --shadow $shadow"
     fi