From: Sage Weil <sage@inktank.com>
Date: Wed, 8 May 2013 21:35:54 +0000 (-0700)
Subject: init-ceph: fix osd_data location when checking df utilization
X-Git-Tag: v0.62~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2a54cc9c98a9f31aef049c74ea932b2d9000d3c;p=ceph.git

init-ceph: fix osd_data location when checking df utilization

Do not assume default osd data location.

Fixes: #4951
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowelll <gary.lowell@inktank.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 57ae19b11e1b..a9ee60b3280a 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -310,8 +310,8 @@ 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 /var/lib/ceph/osd/ceph-$id/ | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'`
-		    get_conf osd_keyring "/var/lib/ceph/osd/ceph-$id/keyring" "keyring"
+		    defaultweight=`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" \