Merge branch 'svn-trunk'

scst/README.dlm

@@ -85,8 +85,9 @@ Startup and Shutdown
 --------------------
 
 The startup sequence is as follows:
-* Load and configure SCST with cluster_mode = 0 and with all target ports
-  disabled.
+* Load the DLM kernel module. If not loaded explicitly, "modprobe scst" will
+  load the DLM kernel module implicitly.
+* Load and configure SCST with all target ports disabled.
 * Enable cluster mode for all SCST devices that can be accessed through more
   than one cluster node:
     for x in /sys/kernel/scst_tgt/handlers/*/*/; do
@@ -103,10 +104,17 @@ The startup sequence is as follows:
 	crmadmin -S "$dc" 2>/dev/null |
 	sed 's/^Status of crmd@[^[:blank:]]*:[[:blank:]]\([^[:blank:]]*\).*/\1/'
     }
-    for ((i=0;i<300;i++)); do
-	[ "$(pacemaker_dc_status)" = "S_IDLE" ] && break
+    timeout=300
+    for ((i=0;i<timeout;i++)); do
+	if [ "$(pacemaker_dc_status)" = "S_IDLE" ]; then
+	    echo "Pacemaker reached idle state after $i s"
+	    break
+	fi
 	sleep 1
     done
+    if [ "$i" = "$timeout" ]; then
+	echo "Pacemaker did not reach the IDLE state in $i s"
+    fi
 * Enable SCST target ports.
 * If no DLM resource has been configured in Pacemaker, start dlm_controld.pcmk
   explicitly.

srpt/Testing.txt

@@ -37,8 +37,8 @@ At least the following tests must be run before releasing a new SRPT version:
       rm -rf /mnt/test* && \
       fio --verify=md5 -rw=randwrite --size=10m --bs=4k \
         --loops=1000000 --iodepth=64 --group_reporting --sync=1 --direct=1 \
-        --norandommap --ioengine=aio --directory=/mnt --name=test --thread \
-        --numjobs=80 --runtime=30 && \
+        --ioengine=aio --directory=/mnt --name=test --thread --numjobs=80 \
+	--runtime=30 && \
       fsck -N $dev
     do
       true