Whamcloud - gitweb
LU-4864 tests: cleanup shared files in sanity-hsm 62/12962/2
authorMinh Diep <minh.diep@intel.com>
Fri, 5 Dec 2014 20:03:25 +0000 (12:03 -0800)
committerOleg Drokin <oleg.drokin@intel.com>
Tue, 27 Jan 2015 02:41:14 +0000 (02:41 +0000)
Test creates shared files need to remove them completely

This patch is back-ported from the following one:
Lustre-commit: 9c096264c14c70e88e38ee1de9b05b494491fd28
Lustre-change: http://review.whamcloud.com/10073

Signed-off-by: Minh Diep <minh.diep@intel.com>
Change-Id: I94e5de73f867f87a6e63b2ea213637a5d0cad488
Reviewed-on: http://review.whamcloud.com/12962
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/sanity-hsm.sh

index 935f8aa..26161ac 100755 (executable)
@@ -263,11 +263,13 @@ get_copytool_event_log() {
 
 copytool_cleanup() {
        trap - EXIT
-       local agents=${1:-$(facet_active_host $SINGLEAGT)}
+       local facet=$SINGLEAGT
+       local agents=${1:-$(facet_active_host $facet)}
        local mdtno
        local idx
        local oldstate
        local mdt_hsmctrl
+       local hsm_root=$(copytool_device $facet)
 
        do_nodesv $agents "pkill -INT -x $HSMTOOL_BASE" || return 0
        sleep 1
@@ -292,6 +294,7 @@ copytool_cleanup() {
                        "$oldstate" 20 ||
                        error "mds${mdtno} cdt state is not $oldstate"
        done
+       do_facet $facet "rm -rf $hsm_root"
 }
 
 copytool_suspend() {