From: Dmitry Smirnov Date: Tue, 25 Mar 2014 10:51:01 +0000 (+1100) Subject: fix bug in 'defaultweight' calculation on OSD start. X-Git-Tag: v0.79~91^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4cf9a73bacb73706fff66110528b733e9ec80b21;p=ceph.git fix bug in 'defaultweight' calculation on OSD start. awk: cmd. line:1: { d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r } awk: cmd. line:1: ^ backslash not last character on line awk: cmd. line:1: { d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r } awk: cmd. line:1: ^ syntax error Signed-off-by: Dmitry Smirnov --- diff --git a/src/init-ceph.in b/src/init-ceph.in index dac00d9054cf2..df23dc4f43b2e 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -323,7 +323,7 @@ for name in $what; do get_conf osd_location_hook "$BINDIR/ceph-crush-location" "osd crush location hook" osd_location=`$osd_location_hook --cluster ceph --id $id --type osd` get_conf osd_weight "" "osd crush initial weight" - defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }')" + defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.2f",$2/1073741824) }')" get_conf osd_keyring "$osd_data/keyring" "keyring" do_cmd "timeout 10 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location" fi