RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysvinit: fix osd weight calculation on remote hosts

Browse Source 
We need to do df on the remote host, not locally.

Simlarly, the ceph command uses the osd key, which exists remotely; run it there.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-05-22 09:47:29 -07:00
parent caa15a34cb
commit d81d0ea5c4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/init-ceph.in
View File

@ -310,19 +310,20 @@ for name in $what; do
# command line, ceph.conf can override what it wants
get_conf osd_location "" "osd crush location"
get_conf osd_weight "" "osd crush initial weight"
defaultweight=`df $osd_data/. | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'`
defaultweight="$(do_cmd "df $osd_data/. | tail -1 | awk '{ d= \$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }'")"
get_conf osd_keyring "$osd_data/keyring" "keyring"
$BINDIR/ceph \
--name="osd.$id" \
--keyring="$osd_keyring" \
do_cmd "$BINDIR/ceph \
--name=osd.$id \
--keyring=$osd_keyring \
osd crush create-or-move \
-- \
"$id" \
"${osd_weight:-${defaultweight:-1}}" \
$id \
${osd_weight:-${defaultweight:-1}} \
root=default \
host="$host" \
host=$host \
$osd_location \
|| :
|| :"
fi
fi