From: Sage Weil <sage@newdream.net>
Date: Wed, 11 Mar 2009 20:08:33 +0000 (-0700)
Subject: mds: fix up startup options
X-Git-Tag: v0.7.1^2~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfefb98e9cc5882ae69228a04bd61c4f65410b38;p=ceph.git

mds: fix up startup options
---

diff --git a/man/cmds.8 b/man/cmds.8
index 5d2e346e8d3..d0c9d942809 100644
--- 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 ca1f242c306..0920a59777f 100644
--- 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 27c60be4658..505c58b571f 100755
--- 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