Skip to content

ZTS: zpool_export_parallel_admin.sh busy export#18447

Merged
behlendorf merged 1 commit intoopenzfs:masterfrom
behlendorf:zts-zpool_export_parallel_admin
Apr 22, 2026
Merged

ZTS: zpool_export_parallel_admin.sh busy export#18447
behlendorf merged 1 commit intoopenzfs:masterfrom
behlendorf:zts-zpool_export_parallel_admin

Conversation

@behlendorf
Copy link
Copy Markdown
Contributor

Motivation and Context

https://github.com/openzfs/zfs/actions/runs/24734611095/job/72358686292?pr=18436

 Debuginfo of failed tests:
cli_root/zpool_export/zpool_export_parallel_admin (5 KiB)
  [2026-04-21T17:31:53.799845] Test: /usr/local/share/zfs/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_admin (run as root) [00:00] [FAIL]
  17:31:53.57 ASSERTION: admin commands cannot race a pool export
  17:31:53.58 SUCCESS: mkdir -p /var/tmp/dev_export-test
  17:31:53.59 SUCCESS: truncate -s 268435456 /var/tmp/dev_export-test/disk0 /var/tmp/dev_export-test/disk1
  17:31:53.65 SUCCESS: zpool create -f testpool1 mirror /var/tmp/dev_export-test/disk0 /var/tmp/dev_export-test/disk1
  17:31:53.66 Added handler 30 with the following properties:
  17:31:53.66   pool: testpool1
  17:31:53.66  time: 10 seconds
  17:31:53.66 SUCCESS: zinject -P export -s 10 testpool1
  17:31:53.68 cannot export 'testpool1': pool is busy
  17:31:53.68 ERROR: zpool export testpool1 exited 1

Description

If the pool is active 'zpool export' will fail resulting in a test failure. Swap log_must with log_must_busy so the export is retried when reported as busy before failing the test.

How Has This Been Tested?

Will be tested by the CI.

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)
  • Quality assurance (non-breaking change which makes the code more robust against bugs)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

If the pool is active 'zpool export' will fail resulting in
a test failure.  Swap log_must with log_must_busy so the export
is retried when reported as busy before failing the test.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Copilot AI review requested due to automatic review settings April 21, 2026 20:04
@behlendorf behlendorf added Component: Test Suite Indicates an issue with the test framework or a test case Status: Code Review Needed Ready for review and testing labels Apr 21, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR hardens the ZFS Test Suite (ZTS) zpool_export_parallel_admin test against transient zpool export failures when the pool is reported as busy, addressing a CI flake observed in cli_root/zpool_export/zpool_export_parallel_admin.

Changes:

  • Replace log_must with log_must_busy for zpool export so the test retries on “busy” before failing.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Apr 22, 2026
@behlendorf behlendorf merged commit 3162c63 into openzfs:master Apr 22, 2026
89 of 95 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Component: Test Suite Indicates an issue with the test framework or a test case Status: Accepted Ready to integrate (reviewed, tested)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants