From: Kefu Chai <kchai@redhat.com>
Date: Wed, 26 May 2021 01:06:19 +0000 (+0800)
Subject: vstart: use block_devs for {blue,sea}store_dev
X-Git-Tag: v17.1.0~1839^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6de7b86e09d3df747c7745208920b24be410bda3;p=ceph.git

vstart: use block_devs for {blue,sea}store_dev

so the logic handling bluestore_dev and seastore_dev can be merged.

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

diff --git a/src/vstart.sh b/src/vstart.sh
index c8bc25cf8efc..260a33302d52 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -177,8 +177,7 @@ fi
 
 filestore_path=
 kstore_path=
-bluestore_dev=
-seastore_dev=
+declare -a block_devs
 
 VSTART_SEC="client.vstart.sh"
 
@@ -438,8 +437,8 @@ case $1 in
         with_mgr_dashboard=false
         ;;
     --seastore-devs)
-        IFS=',' read -r -a seastore_dev <<< "$2"
-        for dev in "${seastore_dev[@]}"; do
+        IFS=',' read -r -a block_devs <<< "$2"
+        for dev in "${block_devs[@]}"; do
             if [ ! -b $dev -o ! -w $dev ]; then
                 echo "All --seastore-devs must refer to writable block devices"
                 exit 1
@@ -454,8 +453,8 @@ case $1 in
         shift
         ;;
     --bluestore-devs)
-        IFS=',' read -r -a bluestore_dev <<< "$2"
-        for dev in "${bluestore_dev[@]}"; do
+        IFS=',' read -r -a block_devs <<< "$2"
+        for dev in "${block_devs[@]}"; do
             if [ ! -b $dev -o ! -w $dev ]; then
                 echo "All --bluestore-devs must refer to writable block devices"
                 exit 1
@@ -917,19 +916,17 @@ EOF
                 ln -s $filestore_path $CEPH_DEV_DIR/osd$osd
             elif [ -n "$kstore_path" ]; then
                 ln -s $kstore_path $CEPH_DEV_DIR/osd$osd
-            elif [ -n "${seastore_dev[$osd]}" ]; then
-                mkdir -p $CEPH_DEV_DIR/osd$osd
-                dd if=/dev/zero of=${seastore_dev[$osd]} bs=1M count=1
-                ln -s ${seastore_dev[$osd]} $CEPH_DEV_DIR/osd$osd/block
             else
                 mkdir -p $CEPH_DEV_DIR/osd$osd
-                if [ -n "${bluestore_dev[$osd]}" ]; then
-                    dd if=/dev/zero of=${bluestore_dev[$osd]} bs=1M count=1
-                    ln -s ${bluestore_dev[$osd]} $CEPH_DEV_DIR/osd$osd/block
-                    wconf <<EOF
+                if [ -n "${block_devs[$osd]}" ]; then
+                    dd if=/dev/zero of=${block_devs[$osd]} bs=1M count=1
+                    ln -s ${block_devs[$osd]} $CEPH_DEV_DIR/osd$osd/block
+                fi
+            fi
+            if [ "$objectstore" == "bluestore" ]; then
+                wconf <<EOF
         bluestore fsck on mount = false
 EOF
-                fi
             fi
 
             local uuid=`uuidgen`