# HG changeset patch # User Kody Kantor # Date 1559151243 0 # Node ID ebeeffcb370f9bab89ced22f6979a88d309a76ef # Parent ff7bcdbce7ad05b65747cdee55a52711ee8ac93e 11076 ZFS test mmp_on_zdb should clear disk labels on exit Reviewed by: Jerry Jelinek Reviewed by: Toomas Soome Reviewed by: Igor Kozhukhov Reviewed by: Andy Stormont Reviewed by: John Kennedy Approved by: Dan McDonald diff -r ff7bcdbce7ad -r ebeeffcb370f usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh --- a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh Tue May 21 17:15:42 2019 +0300 +++ b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh Wed May 29 17:34:03 2019 +0000 @@ -14,6 +14,7 @@ # # Copyright (c) 2018 Lawrence Livermore National Security, LLC. # Copyright (c) 2018 by Nutanix. All rights reserved. +# Copyright 2019 Joyent, Inc. # . $STF_SUITE/include/libtest.shlib @@ -38,9 +39,7 @@ function cleanup { datasetexists $TESTPOOL && destroy_pool $TESTPOOL - for DISK in $DISKS; do - zpool labelclear -f $DEV_RDSKDIR/$DISK - done + cleanup_devices $DISKS log_must mmp_clear_hostid }