From: David Disseldorp <ddiss@suse.de>
Date: Thu, 23 Feb 2017 12:01:25 +0000 (+0100)
Subject: nvme_rbd_autorun.sh: minor cleanups
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=2efb6610cf8d8107aa2560781548b0296334656c;p=ddiss%2Frapido.git

nvme_rbd_autorun.sh: minor cleanups

load modules before attempting to enable dynamic debug.
Stop on nvmet configfs I/O failure, but don't fail if the kernel modules
can't be loaded - they may be in kernel.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---

diff --git a/nvme_rbd_autorun.sh b/nvme_rbd_autorun.sh
index 566c5cd..ba85297 100755
--- a/nvme_rbd_autorun.sh
+++ b/nvme_rbd_autorun.sh
@@ -48,18 +48,21 @@ udevadm settle || _fatal
 # confirm that udev brought up the $pool/$img device path link
 [ -L $CEPH_RBD_DEV ] || _fatal
 
-# enable debugfs
 cat /proc/mounts | grep debugfs &> /dev/null
 if [ $? -ne 0 ]; then
 	mount -t debugfs debugfs /sys/kernel/debug/
 fi
 
-# mount configfs first
 cat /proc/mounts | grep configfs &> /dev/null
 if [ $? -ne 0 ]; then
 	mount -t configfs configfs /sys/kernel/config/
 fi
 
+modprobe nvme-core
+modprobe nvme-fabrics
+modprobe nvme-loop
+modprobe nvmet
+
 for i in $DYN_DEBUG_MODULES; do
 	echo "module $i +pf" > /sys/kernel/debug/dynamic_debug/control || _fatal
 done
@@ -67,26 +70,23 @@ for i in $DYN_DEBUG_FILES; do
 	echo "file $i +pf" > /sys/kernel/debug/dynamic_debug/control || _fatal
 done
 
-modprobe nvme-core || _fatal
-modprobe nvme-fabrics || _fatal
-modprobe nvme-loop || _fatal
-modprobe nvmet || _fatal
-
-mkdir -p /sys/kernel/config/nvmet/subsystems/nvmf-test
-cd /sys/kernel/config/nvmet/subsystems/nvmf-test
-echo 1 > attr_allow_any_host
-mkdir namespaces/1
-cd namespaces/1
-echo -n $CEPH_RBD_DEV > device_path
-echo 1 > enable
+nvmet_subsystem="nvmf-test"
+mkdir -p /sys/kernel/config/nvmet/subsystems/${nvmet_subsystem} || _fatal
+cd /sys/kernel/config/nvmet/subsystems/${nvmet_subsystem} || _fatal
+echo 1 > attr_allow_any_host || _fatal
+mkdir namespaces/1 || _fatal
+cd namespaces/1 || _fatal
+echo -n $CEPH_RBD_DEV > device_path || _fatal
+echo 1 > enable || _fatal
 
-mkdir /sys/kernel/config/nvmet/ports/1
-cd /sys/kernel/config/nvmet/ports/1
-echo loop > addr_trtype
+mkdir /sys/kernel/config/nvmet/ports/1 || _fatal
+cd /sys/kernel/config/nvmet/ports/1 || _fatal
+echo loop > addr_trtype || _fatal
 
-ln -s /sys/kernel/config/nvmet/subsystems/nvmf-test subsystems/nvmf-test
+ln -s /sys/kernel/config/nvmet/subsystems/${nvmet_subsystem} \
+	subsystems/${nvmet_subsystem} || _fatal
 
-echo "transport=loop,nqn=nvmf-test" > /dev/nvme-fabrics
+echo "transport=loop,nqn=${nvmet_subsystem}" > /dev/nvme-fabrics || _fatal
 
 set +x