From a30d9ca5ad2cc2b2e8b2a602cd6d43fc53f8b00c Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Thu, 22 Oct 2015 18:45:35 +0100
Subject: [PATCH] vstart: don't call "fs new" repeatedly

It was doing it once for each MDS, which is safe
(because it's idempotent) but silly.

Signed-off-by: John Spray <john.spray@redhat.com>
---
 src/vstart.sh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index 94e8dd817fc9d..c1fc7ed7ff8a6 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -627,6 +627,22 @@ EOF
 fi
 
 if [ "$start_mds" -eq 1 -a "$CEPH_NUM_MDS" -gt 0 ]; then
+    cmd="$CEPH_ADM osd pool create cephfs_data 8"
+    echo $cmd
+    $cmd
+
+    cmd="$CEPH_ADM osd pool create cephfs_metadata 8"
+    echo $cmd
+    $cmd
+
+    cmd="$CEPH_ADM fs new cephfs cephfs_metadata cephfs_data"
+    echo $cmd
+    $cmd
+
+    cmd="$CEPH_ADM mds set max_mds $CEPH_NUM_MDS"
+    echo $cmd
+    $cmd
+
     mds=0
     for name in a b c d e f g h i j k l m n o p
     do
@@ -657,17 +673,6 @@ EOF
 			mon 'allow *' osd 'allow *' mds 'allow'
 	    fi
 
-        cmd="$CEPH_ADM osd pool create cephfs_data 8"
-        echo $cmd
-        $cmd
-
-        cmd="$CEPH_ADM osd pool create cephfs_metadata 8"
-        echo $cmd
-        $cmd
-
-        cmd="$CEPH_ADM fs new cephfs cephfs_metadata cephfs_data"
-        echo $cmd
-        $cmd
 	fi
 	
 	run 'mds' $CEPH_BIN/ceph-mds -i $name $ARGS $CMDS_ARGS
@@ -682,9 +687,6 @@ EOF
 #$CEPH_BIN/ceph-mds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20
 #$CEPH_ADM mds set max_mds 2
     done
-    cmd="$CEPH_ADM mds set max_mds $CEPH_NUM_MDS"
-    echo $cmd
-    $cmd
 fi
 
 if [ "$ec" -eq 1 ]; then
-- 
2.39.5