From 211f7cb550431f326d9fdd0d560c56b89dc1072e Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Tue, 15 Nov 2016 00:34:53 +0800 Subject: [PATCH] LU-9231 tests: cleanup obdecho before iokit exit Otherwise under some failure cases, it may leave the FID_SEQ_LOCAL_NAME local object which is used by the obdecho in the system, then the subsequent tests can NOT exit cleanly. Lustre-commit: c5675497b411d8b3f0f08fec3271fd528b4a52cf Lustre-change: http://review.whamcloud.com/23738 Test-Parameters: alwaysuploadlogs envdefinitions=PTLDEBUG=-1,DEBUG_SIZE=150 mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs clientdistro=el7 ossdistro=el7 mdsdistro=el7 mdscount=2 mdtcount=4 testlist=mds-survey,mmp,mds-survey,mmp,mds-survey,mmp Signed-off-by: Fan Yong Signed-off-by: Bob Glossman Change-Id: I741cf20875df679ecdf72d5461cc14eec166e3ae Reviewed-by: Jian Yu Reviewed-by: John L. Hammond Reviewed-on: https://review.whamcloud.com/26092 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre-iokit/obdfilter-survey/iokit-libecho | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre-iokit/obdfilter-survey/iokit-libecho b/lustre-iokit/obdfilter-survey/iokit-libecho index 3cd02f6..e194b6b 100644 --- a/lustre-iokit/obdfilter-survey/iokit-libecho +++ b/lustre-iokit/obdfilter-survey/iokit-libecho @@ -255,7 +255,7 @@ cleanup () { fi exit $exit_status } -trap 'cleanup 0 $clean_srv_OSS $cleanup_oscs' SIGHUP SIGINT SIGTERM +trap 'cleanup 0 $clean_srv_OSS $cleanup_oscs' EXIT SIGHUP SIGINT SIGTERM # gets echoclient device number and attach it to the client UUID # Results are returned by an echo followed by an exit -- 1.8.3.1