From: Alex Elder <elder@inktank.com>
Date: Wed, 22 May 2013 21:50:19 +0000 (-0500)
Subject: rbd image_read.sh: ensure rbd is loaded
X-Git-Tag: v0.64~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a8d9962bed2804e75d534248ba661ba596be56a;p=ceph.git

rbd image_read.sh: ensure rbd is loaded

Make sure rbd is loaded before proceeding with the script.

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

diff --git a/qa/workunits/rbd/image_read.sh b/qa/workunits/rbd/image_read.sh
index 5cf74e57060f..307ff373966c 100755
--- a/qa/workunits/rbd/image_read.sh
+++ b/qa/workunits/rbd/image_read.sh
@@ -261,6 +261,7 @@ function setup() {
 	mkdir -p $(out_data_dir)
 
 	if [ "${LOCAL_FILES}" != true -a "${SUSER}" != true ]; then
+		[ -d /sys/bus/rbd ] || sudo modprobe rbd
 		# allow ubuntu user to map/unmap rbd devices
 		sudo chown ubuntu /sys/bus/rbd/add
 		sudo chown ubuntu /sys/bus/rbd/remove