RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart.sh: fix params generation for monmaptool

Browse Source 
Fixes: http://tracker.ceph.com/issues/38174

This broke in the msgr21 case, due to bash globbing in cases where
the generated string somehow matched names of certain files in local
directory. Also need to pass params to the prun function separately,
otherwise everything is quoted together.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2019-02-04 16:35:20 -08:00
parent d239c2a8b4
commit 2ff5439c2b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vstart.sh
View File

@ -680,7 +680,7 @@ start_mon() {
"$keyring_fn"
# build a fresh fs monmap, mon fs
local str=""
local params=()
local count=0
local mon_host=""
for f in $MONS
@ -694,7 +694,7 @@ start_mon() {
if [ $msgr -eq 21 ]; then
A="[v2:$IP:$(($CEPH_PORT+$count)),v1:$IP:$(($CEPH_PORT+$count+1))]"
fi
str="$str --addv $f $A"
params+=("--addv" "$f" "$A")
mon_host="$mon_host $A"
wconf <<EOF
[mon.$f]
@ -707,7 +707,7 @@ EOF
[global]
mon host = $mon_host
EOF
prun "$CEPH_BIN/monmaptool" --create --clobber $str --print "$monmap_fn"
prun "$CEPH_BIN/monmaptool" --create --clobber "${params[@]}" --print "$monmap_fn"
for f in $MONS
do