Mercurial > illumos > git > illumos-omnios
changeset 21401:ebeeffcb370f
11076 ZFS test mmp_on_zdb should clear disk labels on exit
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Toomas Soome <toomas@me.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| author | Kody Kantor <kody@kkantor.com> |
|---|---|
| date | Wed, 29 May 2019 17:34:03 +0000 |
| parents | ff7bcdbce7ad |
| children | 60e796757b53 |
| files | usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 }