X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Fconf-sanity.sh;h=1e2e598f05f5318db854e3fea25807f9db8467eb;hb=82a0cc9ee5489340406a6fc64494f37989099729;hp=b453de741de108b3f8d8a70125f7e581af79d32b;hpb=3c1c462399eed685b362ebb70245ea20d262439d;p=fs%2Flustre-release.git

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index b453de7..1e2e598 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -19,9 +19,6 @@ if [ "$FAILURE_MODE" = "HARD" ]; then
 	ALWAYS_EXCEPT="$ALWAYS_EXCEPT $CONFIG_EXCEPTIONS"
 fi
 
-# LU-2059
-ALWAYS_EXCEPT="$ALWAYS_EXCEPT 5d 19b 21b 27a"
-
 # bug number for skipped test:
 # a tool to create lustre filesystem images
 ALWAYS_EXCEPT="32newtarball $ALWAYS_EXCEPT"
@@ -421,6 +418,9 @@ test_5d() {
 	grep " $MOUNT " /etc/mtab && \
 		error false "unexpected entry in mtab before mount" && return 10
 
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-2059: no local config for ZFS OSTs" && return
+
 	local rc=0
 	start_ost
 	start_mds
@@ -660,6 +660,9 @@ test_19a() {
 run_test 19a "start/stop MDS without OSTs"
 
 test_19b() {
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-2059: no local config for ZFS OSTs" && return
+
 	start_ost || return 1
 	stop_ost -f || return 2
 }
@@ -696,6 +699,9 @@ test_21a() {
 run_test 21a "start mds before ost, stop ost first"
 
 test_21b() {
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-2059: no local config for ZFS OSTs" && return
+
         start_ost
 	start_mds
         wait_osc_import_state mds ost FULL
@@ -961,6 +967,9 @@ test_26() {
 run_test 26 "MDT startup failure cleans LOV (should return errs)"
 
 test_27a() {
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-2059: no local config for ZFS OSTs" && return
+
 	start_ost || return 1
 	start_mds || return 2
 	echo "Requeue thread should have started: "
@@ -1697,7 +1706,8 @@ test_35a() { # bug 12459
 	log "Set up a fake failnode for the MDS"
 	FAKENID="127.0.0.2"
 	local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
-	do_facet mgs $LCTL conf_param ${device}.failover.node=$FAKENID || return 4
+	do_facet mgs "$LCTL conf_param ${device}.failover.node=" \
+		"$(h2$NETTYPE $FAKENID)" || return 4
 
 	log "Wait for RECONNECT_INTERVAL seconds (10s)"
 	sleep 10
@@ -1751,8 +1761,8 @@ test_35b() { # bug 18674
 	FAKENID="127.0.0.2"
 	local device=$(do_facet $SINGLEMDS "$LCTL get_param -n devices" | \
 			awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
-	do_facet mgs "$LCTL conf_param ${device}.failover.node=$FAKENID" || \
-		return 1
+	do_facet mgs "$LCTL conf_param ${device}.failover.node=" \
+		"$(h2$NETTYPE $FAKENID)" || return 1
 
 	local at_max_saved=0
 	# adaptive timeouts may prevent seeing the issue