From: Alex Elder <elder@inktank.com>
Date: Thu, 30 May 2013 15:10:16 +0000 (-0500)
Subject: rbd/concurrent.sh: probe rbd module at start
X-Git-Tag: v0.65~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f40256878d97fe641c1db9b0e8056304bd14aec4;p=ceph.git

rbd/concurrent.sh: probe rbd module at start

There's no guarantee the rbd module is loaded when this script is
run, so add a line that loads it if necessary.

Signed-off-by: Alex Elder <elder@inktank.com>
---

diff --git a/qa/workunits/rbd/concurrent.sh b/qa/workunits/rbd/concurrent.sh
index 4049535f3e0a..ceb4563567fe 100755
--- a/qa/workunits/rbd/concurrent.sh
+++ b/qa/workunits/rbd/concurrent.sh
@@ -74,6 +74,8 @@ function setup() {
 	NAMES_DIR=$(mktemp -d /tmp/image_names.XXXXXX)
 	SOURCE_DATA=$(mktemp /tmp/source_data.XXXXXX)
 
+	[ -d /sys/bus/rbd ] || sudo modprobe rbd
+
 	# This assumes it's easier to read a file than generate
 	# random data.  Use busybox because it is a big executable.
 	dd if="/bin/busybox" of="{SOURCE_DATA}" bs=2048 count=66 \