Fix zfs_allow_004_pos

[dinatale2]

Description

Datasets can be busy when calling zfs destroy. Introduce
a helper function to destroy datasets and use it to destroy
datasets in zfs_allow_004_pos.

Motivation and Context

Fix failing tests.

How Has This Been Tested?

Locally on a CentOS 7 VM.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Performance enhancement (non-breaking change which improves efficiency)
• Code cleanup (non-breaking change which makes code smaller or more readable)
• Breaking change (fix or feature that would cause existing functionality to change)
• Documentation (a change to man pages or other documentation)

Checklist:

• My code follows the ZFS on Linux code style requirements.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.
• All commit messages are properly formatted and contain Signed-off-by.
• Change has been approved by a ZFS on Linux member.

[behlendorf]

s/$pool/$dataset

[chrisrd]

Looks like that should be a nice cleanup of some spurious test failures!

There was one in zfs_promote_008_pos: #7176 (comment)

It looks like all log_must zfs destroy in zfs-tests/tests/functional/cli_root/zfs_promote/ could/should be replaced by destroy_dataset as they're all in cleanup functions. I.e.:

sed -ri '
  /function cleanup/,/}/ {
    s/log_must zfs destroy (-[^[:space:]]+) ([^[:space:]]+)[[:space:]]*$/destroy_dataset "\2" "\1"/;
    s/log_must zfs destroy ([^[:space:]]+)[[:space:]]*$/destroy_dataset "\1"/;
  }
' tests/zfs-tests/tests/functional/cli_root/zfs_promote/*

In fact, that could likely be run over the whole test suite, but that would require careful manual inspection.

[behlendorf]

@chrisrd yes, that's definitely our hope. It looks like zfs_destroy_002 would also benefit from calling destroy_dataset.

http://build.zfsonlinux.org/builders/Ubuntu%2017.10%20x86_64%20%28TEST%29/builds/633/steps/shell_8/logs/summary

@dinatale2 can you extend this to also cover zfs_promote_008_pos and zfs_destroy_002. Then we can consider applying it more broadly as we observe any remaining failures like this.

[dinatale2]

@chrisrd @behlendorf Refreshed to include zfs_promote_008_pos and zfs_destroy_002.

[behlendorf]

We probably shouldn't default to -f, instead how about typeset args=${2:-""}. Then you can drop the args assignment below, and callers won't need to pass a second argument unless requesting thing the -f behavior.

[codecov]

Codecov Report

Merging #7267 into master will increase coverage by 0.18%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #7267      +/-   ##
==========================================
+ Coverage   76.35%   76.54%   +0.18%     
==========================================
  Files         327      327              
  Lines      103874   103866       -8     
==========================================
+ Hits        79314    79500     +186     
+ Misses      24560    24366     -194

Flag	Coverage Δ
#kernel	76.21% <ø> (+0.03%)	⬆️
#user	65.9% <ø> (+0.17%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2705ebf...5026d44. Read the comment docs.