[Ocfs2-test-devel] [PATCH 09/59] ocfs2-test: fix discontig-bg single test

[Junxiao Bi]

From: Tiger Yang <tiger.yang at oracle.com>

Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
 .../discontig_bg_test/activate_discontig_bg.sh     |    4 +++
 programs/discontig_bg_test/discontig_runner.sh     |   28 +++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/programs/discontig_bg_test/activate_discontig_bg.sh b/programs/discontig_bg_test/activate_discontig_bg.sh
index a7d9d12..4239190 100755
--- a/programs/discontig_bg_test/activate_discontig_bg.sh
+++ b/programs/discontig_bg_test/activate_discontig_bg.sh
@@ -120,6 +120,10 @@ function f_verify_hosts()
 		((slots++))
 	done
 
+	if [ "$slots" -eq "0" ];then
+		slots=1
+	fi
+
 	SLOTS=${slots}
 
 	return 0
diff --git a/programs/discontig_bg_test/discontig_runner.sh b/programs/discontig_bg_test/discontig_runner.sh
index ae50ad5..a9e74bd 100755
--- a/programs/discontig_bg_test/discontig_runner.sh
+++ b/programs/discontig_bg_test/discontig_runner.sh
@@ -429,6 +429,9 @@ function f_extents_test()
         RET=$?
         f_exit_or_not ${RET}
 
+	${RM_BIN} -rf ${MOUNT_POINT}/ocfs2-fillup-contig-bg-dir-*
+	sync
+
 	WORK_PLACE=${MOUNT_POINT}/${WORK_PLACE_DIRENT}
 	${MKDIR_BIN} -p ${WORK_PLACE}
 
@@ -549,55 +552,62 @@ function f_inline_test()
 	RET=$?
 	f_exit_or_not ${RET}
 
+	${RM_BIN} -rf ${MOUNT_POINT}/ocfs2-fillup-contig-bg-dir-*
+	sync
+
 	f_LogMsg ${LOG_FILE} "Regular inline-file test."
 	${INLINE_DATA_TEST_BIN} -i 1 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
 	f_LogMsg ${LOG_FILE} "Multiple inline-file test."
-	${INLINE_DATA_TEST_BIN} -i 1 -m 1000 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
+	${INLINE_DATA_TEST_BIN} -i 1 -m 100 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
 	f_LogMsg ${LOG_FILE} "Concurrent inline-file test."
 	${INLINE_DATA_TEST_BIN} -i 1 -c 100 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
 	f_LogMsg ${LOG_FILE} "Stress inline-file test."
 	${INLINE_DATA_TEST_BIN} -i 10 -c 50 -m 100 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 	
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
 	f_LogMsg ${LOG_FILE} "Regular inline-dir test."
 	${INLINE_DIRS_TEST_BIN} -i 1 -s 20 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
 	f_LogMsg ${LOG_FILE} "Multiple inline-dir test."
-	${INLINE_DIRS_TEST_BIN} -i 1 -s 5 -m 1000 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
+	${INLINE_DIRS_TEST_BIN} -i 1 -s 5 -m 100 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
 	f_LogMsg ${LOG_FILE} "Concurrent inline-dir test."
 	${INLINE_DIRS_TEST_BIN} -i 1 -s 5 -c 100 -d ${DEVICE} ${MOUNT_POINT}>>${LOG_FILE} 2>&1 || {
 		return 1
 	}
 
-	${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
+	${SUDO} ${RM_BIN} -rf ${MOUNT_POINT}/inline-data-test
 
+	f_LogMsg ${LOG_FILE} "[*] Umount device ${DEVICE} from ${MOUNT_POINT}:"
+	f_umount ${LOG_FILE} ${MOUNT_POINT}
+	RET=$?
+	f_exit_or_not ${RET}
 }
 
 function f_xattr_test()
-- 
1.7.9.5