Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

block/033 fix #138

Merged
merged 1 commit into from
Apr 23, 2024
Merged

block/033 fix #138

merged 1 commit into from
Apr 23, 2024

Conversation

yizhanglinux
Copy link
Contributor

No description provided.

tests/block/033 Outdated
@@ -7,7 +7,7 @@
# can be covered

. tests/block/rc
. common/ublk
. tests/ublk/rc
Copy link
Collaborator

Choose a reason for hiding this comment

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

This creates dependency from tests/block to tests/ublk, which is not good. Instead, I suggest to take two actions:

  1. move the UBLK_PROG declarations below from tests/ublk/rc to common/ublk
if which rublk > /dev/null 2>&1; then
       export UBLK_PROG="src/rublk_wrapper.sh"
else
       export UBLK_PROG="src/miniublk"
fi
  1. Replace ublk_prog in tests/block/033 with UBLK_PROG.

Copy link
Contributor Author

@yizhanglinux yizhanglinux Apr 19, 2024

Choose a reason for hiding this comment

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

Thanks, updated as suggested, will open another PR for the misc fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ming1 Please help review this change, thanks.

Copy link

Choose a reason for hiding this comment

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

The change is fine for me, thanks!

@kawasaki
Copy link
Collaborator

Hi @yizhanglinux , thanks for this PR.
As I commented, I suggest some modifications to the first commit. It might be the better to separate it into another PR, and ping @ming1 (Ming Lei) to review.
The other two patches look good to me. The commit for nvme group conflict with my "repeat by conditions" series, but it should be easy to resolve.

UBLK_PROG was not defined when calling _have_ublk, move the defination
to common/ublk.
Replace ublk_prog with UBLK_PROG in block/033.
common/fio already included in common/rc, so remove the dup inclusion.

$ ./check block/033
block/033 (add & delete ublk device and test if gendisk is leaked) [not run]
    driver ublk_drv is not available
     is not available

Signed-off-by: Yi Zhang <[email protected]>
@yizhanglinux yizhanglinux changed the title misc fix for nvme and block tests block/033 fix Apr 19, 2024
@kawasaki kawasaki merged commit c4d647b into osandov:master Apr 23, 2024
5 checks passed
@kawasaki
Copy link
Collaborator

@yizhanglinux Thanks! This PR has got merged. FYI, I made a follow-up commit for additional fixes.

@yizhanglinux yizhanglinux deleted the dev-240426-ublk-fix branch April 23, 2024 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants