From: Kefu Chai <kchai@redhat.com>
Date: Wed, 22 Mar 2017 03:34:21 +0000 (+0800)
Subject: vstart.sh: do nothing if $CEPH_NUM_* is 0
X-Git-Tag: v12.0.2~325^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c41fe1eae16aa343fb1d4420fc2e8b418c6a99db;p=ceph.git

vstart.sh: do nothing if $CEPH_NUM_* is 0

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 758f6a4bf6a8..b99fa06671d8 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -504,14 +504,14 @@ start_mon() {
     local count=0
     for f in a b c d e f g h i j k l m n o p q r s t u v w x y z
     do
+        [ $count -eq $CEPH_NUM_MON ] && break;
+        count=$(($count + 1))
         if [ -z "$MONS" ];
         then
 	        MONS="$f"
         else
 	        MONS="$MONS $f"
         fi
-        count=$(($count + 1))
-        [ $count -eq $CEPH_NUM_MON ] && break;
     done
 
     if [ "$new" -eq 1 ]; then
@@ -600,6 +600,8 @@ start_mgr() {
     local mgr=0
     for name in x y z a b c d e f g h i j k l m n o p
     do
+        [ $mgr -eq $CEPH_NUM_MGR ] && break
+        mgr=$(($mgr + 1))
         if [ "$new" -eq 1 ]; then
             mkdir -p $CEPH_DEV_DIR/mgr.$name
             key_fn=$CEPH_DEV_DIR/mgr.$name/keyring
@@ -614,9 +616,6 @@ EOF
 
         echo "Starting mgr.${name}"
         run 'mgr' $CEPH_BIN/ceph-mgr -i $name
-
-        mgr=$(($mgr + 1))
-        [ $mgr -eq $CEPH_NUM_MGR ] && break
     done
 }
 
@@ -640,6 +639,9 @@ start_mds() {
     local mds=0
     for name in a b c d e f g h i j k l m n o p
     do
+	    [ $mds -eq $CEPH_NUM_MDS ] && break
+	    mds=$(($mds + 1))
+
 	    if [ "$new" -eq 1 ]; then
 	        prun mkdir -p "$CEPH_DEV_DIR/mds.$name"
 	        key_fn=$CEPH_DEV_DIR/mds.$name/keyring
@@ -671,9 +673,6 @@ EOF
 	        run 'mds' $CEPH_BIN/ceph-mds -i ${name}s $ARGS $CMDS_ARGS
 	    fi
 
-	    mds=$(($mds + 1))
-	    [ $mds -eq $CEPH_NUM_MDS ] && break
-
         #valgrind --tool=massif $CEPH_BIN/ceph-mds $ARGS --mds_log_max_segments 2 --mds_thrash_fragments 0 --mds_thrash_exports 0 > m  #--debug_ms 20
         #$CEPH_BIN/ceph-mds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20
         #ceph_adm mds set max_mds 2
@@ -823,12 +822,12 @@ fi
 fs=0
 for name in a b c d e f g h i j k l m n o p
 do
+    [ $fs -eq $CEPH_NUM_FS ] && break
+    fs=$(($fs + 1))
     if [ "$CEPH_MAX_MDS" -gt 1 ]; then
         ceph_adm fs set "cephfs_${name}" allow_multimds true --yes-i-really-mean-it
         ceph_adm fs set "cephfs_${name}" max_mds "$CEPH_MAX_MDS"
     fi
-    fs=$(($fs + 1))
-    [ $fs -eq $CEPH_NUM_FS ] && break
 done
 
 # mgr