From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 9 Jun 2016 21:14:36 +0000 (-0400)
Subject: vstart: add --nolockdep option
X-Git-Tag: v11.0.0~235^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5eec7b2f4222dde0cfdaa9e0e4b43be015c3692;p=ceph.git

vstart: add --nolockdep option

rbd-mirror stress test cases need a way to disable lockdep when
initiated in a vstart environment.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index e48f4e9e0c16..f6c196a4f250 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -99,6 +99,7 @@ cephx=1 #turn cephx on by default
 cache=""
 memstore=0
 bluestore=0
+lockdep=${LOCKDEP:-1}
 
 VSTART_SEC="client.vstart.sh"
 
@@ -135,6 +136,7 @@ usage=$usage"\t--bluestore use bluestore as the osd objectstore backend\n"
 usage=$usage"\t--memstore use memstore as the osd objectstore backend\n"
 usage=$usage"\t--cache <pool>: enable cache tiering on pool\n"
 usage=$usage"\t--short: short object names only; necessary for ext4 dev\n"
+usage=$usage"\t--nolockdep disable lockdep\n"
 
 usage_exit() {
 	printf "$usage"
@@ -271,6 +273,9 @@ case $1 in
 	    fi
 	    shift
 	    ;;
+    --nolockdep )
+            lockdep=0
+            ;;
     * )
 	    usage_exit
 esac
@@ -370,9 +375,6 @@ if [ "$bluestore" -eq 1 ]; then
 	osd objectstore = bluestore'
 fi
 
-# lockdep everywhere?
-# export CEPH_ARGS="--lockdep 1"
-
 if [ -z "$CEPH_PORT" ]; then
     CEPH_PORT=6789
     [ -e ".ceph_port" ] && CEPH_PORT=`cat .ceph_port`
@@ -473,8 +475,12 @@ if [ "$start_mon" -eq 1 ]; then
         filestore fd cache size = 32
         run dir = $CEPH_OUT_DIR
         enable experimental unrecoverable data corrupting features = *
+EOF
+if [ "$lockdep" -eq 1 ] ; then
+cat <<EOF >> $conf_fn
         lockdep = true
 EOF
+fi
 if [ "$cephx" -eq 1 ] ; then
 cat <<EOF >> $conf_fn
         auth supported = cephx