From dfcbcb5b11c18cf918dbec7e6ab11526f90884dd Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 25 Mar 2016 13:18:26 +0800 Subject: [PATCH] vstart: use default CEPH_NUM_* if fails to read them add a section named "client.vstart.sh" for storing the num_{osd,mon,mds,rgw} settings. and read them using ceph-conf if the "-k" option is passed in. if we fail to do so, fall back to the default settings. Signed-off-by: Kefu Chai --- src/vstart.sh | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index c81a793245a29..cca89da2d4638 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -99,6 +99,8 @@ cache="" memstore=0 bluestore=0 +VSTART_SEC="client.vstart.sh" + MON_ADDR="" conf_fn="$CEPH_CONF_PATH/ceph.conf" @@ -262,10 +264,14 @@ shift done if [ "$overwrite_conf" -eq 0 ]; then - CEPH_NUM_MON=`awk -F= '/CEPH_NUM_MON/{print $2}' $conf_fn` - CEPH_NUM_OSD=`awk -F= '/CEPH_NUM_OSD/{print $2}' $conf_fn` - CEPH_NUM_MDS=`awk -F= '/CEPH_NUM_MDS/{print $2}' $conf_fn` - CEPH_NUM_RGW=`awk -F= '/CEPH_NUM_RGW/{print $2}' $conf_fn` + MON=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_mon 2>/dev/null` && \ + CEPH_NUM_MON="$MON" + OSD=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_osd 2>/dev/null` && \ + CEPH_NUM_OSD="$OSD" + MDS=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_mds 2>/dev/null` && \ + CEPH_NUM_MDS="$MDS" + RGW=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_rgw 2>/dev/null` && \ + CEPH_NUM_RGW="$RGW" fi if [ "$start_all" -eq 1 ]; then @@ -429,10 +435,12 @@ if [ "$start_mon" -eq 1 ]; then if [ $overwrite_conf -eq 1 ]; then cat < $conf_fn ; generated by vstart.sh on `date` -; CEPH_NUM_MON=$CEPH_NUM_MON -; CEPH_NUM_OSD=$CEPH_NUM_OSD -; CEPH_NUM_MDS=$CEPH_NUM_MDS -; CEPH_NUM_RGW=$CEPH_NUM_RGW +[$VSTART_SEC] + num mon = $CEPH_NUM_MON + num osd = $CEPH_NUM_OSD + num mds = $CEPH_NUM_MDS + num rgw = $CEPH_NUM_RGW + [global] fsid = $(uuidgen) osd pg bits = 3 -- 2.39.5