From 74b08abb573f2ea6e3e95077aa8fd30a5e30830e Mon Sep 17 00:00:00 2001 From: Li Wei Date: Mon, 4 Feb 2013 10:27:29 +0800 Subject: [PATCH] LU-2734 tests: Remove XXXDEV overrides in init_facets_vars() init_facets_vars() assigns outputs of xxxdevname() calls to XXXDEVs. This is incorrect because XXXDEVs are supposed to contain device names while xxxdevname() calls may print dataset names for ZFS-based facets. Actually, XXXDEV should not be changed at all. This patch removes the XXXDEV assignments. Change-Id: Id484390cbd814c6fa919c02e390700f914561434 Signed-off-by: Li Wei Reviewed-on: http://review.whamcloud.com/5243 Tested-by: Hudson Reviewed-by: Jian Yu Reviewed-by: Nathaniel Clark Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 26dda7b..4da5ca5 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -3155,18 +3155,15 @@ init_facets_vars () { if ! remote_mds_nodsh; then for num in $(seq $MDSCOUNT); do DEVNAME=`mdsdevname $num` - eval export MDSDEV${num}=$DEVNAME init_facet_vars mds$num $DEVNAME $MDS_MOUNT_OPTS done fi - eval export MGSDEV=$(mgsdevname) combined_mgs_mds || init_facet_vars mgs $(mgsdevname) $MGS_MOUNT_OPTS if ! remote_ost_nodsh; then for num in $(seq $OSTCOUNT); do DEVNAME=$(ostdevname $num) - eval export OSTDEV${num}=$DEVNAME init_facet_vars ost$num $DEVNAME $OST_MOUNT_OPTS done fi -- 1.8.3.1