From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 27 Feb 2009 20:36:38 +0000 (-0800)
Subject: cephd: added "osd journal" option
X-Git-Tag: v0.7~115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4eef372fd469cd3531cf07a2a08fa768b3c5047;p=ceph.git

cephd: added "osd journal" option
---

diff --git a/src/cephd b/src/cephd
index b64546e930df..aca0f5b8583b 100755
--- a/src/cephd
+++ b/src/cephd
@@ -9,6 +9,7 @@ def_num_osd=1
 def_num_mds=1
 def_debug=0
 def_osd_dev=dev/osd\$osd
+def_osd_journal=""
 
 
 SCRIPT_BIN=`dirname $0`
@@ -200,6 +201,8 @@ if [ $select_osd -eq 1 ]; then
 	do
 		get_conf_bool use_sudo 0 sudo osd$osd osd global
 		get_conf osd_dev $def_osd_dev "osd dev" osd$osd osd global
+		[ "$def_osd_journal" == "" ] && [ -ne $def_osd_journal ] && def_osd_journal=""
+		get_conf osd_journal $def_osd_journal "osd journal" osd$osd osd global
 		get_conf conf_file $startup_conf_file "conf file" osd$osd osd global
 		get_conf MON_PORT $MON_PORT "mon port" osd$osd osd global
 		get_conf CEPH_HOST $MON_HOST "mon host" osd$osd osd global
@@ -211,13 +214,15 @@ if [ $select_osd -eq 1 ]; then
 		get_conf cd_path "" "ssh path" osd$osd osd global
 		[ "$ssh_host" != "" ] && CD_PATH="cd $cd_path \\;" || CD_PATH=""
 
+		[ "$osd_journal" != "" ] && JOURNAL_OPT="-j $osd_journal"
+
 		echo start osd$osd
 		echo $SSH_HOST $CD_PATH \
 		$CEPH_BIN/crun $norestart $valgrind $SUDO $CEPH_BIN/cosd --conf_file $conf_file \
-			$osd_dev $ARGS $COSD_ARGS -m $MON_HOST:$MON_PORT &
+			$osd_dev $JOURNAL_OPT $ARGS $COSD_ARGS -m $MON_HOST:$MON_PORT &
 		$SSH_HOST $CD_PATH \
 		$CEPH_BIN/crun $norestart $valgrind $SUDO $CEPH_BIN/cosd --conf_file $conf_file \
-			$osd_dev $ARGS $COSD_ARGS -m $MON_HOST:$MON_PORT &
+			$osd_dev $JOURNAL_OPT $ARGS $COSD_ARGS -m $MON_HOST:$MON_PORT &
 	done
 fi