From ea7cf321ad6260b9262638bcf00c7235ecf7c271 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Fri, 4 Oct 2019 04:25:07 -0500 Subject: [PATCH] LU-12677 tests: conf-sanity test_21d must keep zpool Currently test_21d destroys the zpool during writeconf_or_reformat but the zpool must be preserved for writeconf to work as intended. Cray-bug-id: LUS-7688 Test-Parameters: fstype=zfs testlist=conf-sanity Signed-off-by: Shaun Tancheff Change-Id: I8fdc123504b70e59a9ca789141e56815377f6b35 Reviewed-on: https://review.whamcloud.com/35848 Tested-by: jenkins Reviewed-by: Petros Koutoupis Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 23d434a0..2c393d5 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -757,12 +757,18 @@ test_21d() { start_mds || error "MDS start failed" wait_osc_import_state mds ost2 FULL + local zkeeper=${KEEP_ZPOOL} + stack_trap "KEEP_ZPOOL=$zkeeper" EXIT + KEEP_ZPOOL="true" + stop_ost || error "Unable to stop OST1" stop_ost2 || error "Unable to stop OST2" stop_mds || error "Unable to stop MDS" stop_mgs #writeconf to remove all ost2 traces for subsequent tests writeconf_or_reformat + KEEP_ZPOOL="${zkeeper}" + start_mgs || error "unable to start MGS" } run_test 21d "start mgs then ost and then mds" -- 1.8.3.1