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.

Sign up for GitHub

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

Jump to bottom

NAS-129592 / None / [truenas/zfs-2.2-release] Sync with zfs-2.2.5-staging #242

Merged
merged 4 commits into from
Jun 14, 2024
Merged

NAS-129592 / None / [truenas/zfs-2.2-release] Sync with zfs-2.2.5-staging #242

merged 4 commits into from
Jun 14, 2024

Commits on Jun 13, 2024

  1. zdb: add missing cleanup for early return 

    Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Don Brady <don.brady@klarasystems.com>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
Closes openzfs#16152
    @ixhamza
    ixhamza committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4747904 View commit details
    Browse the repository at this point in the history

  2. zdb: detect cachefile automatically otherwise force import 

    If a pool is created with the cache file located in a non-default
path /etc/default/zpool.cache, removed, or the cachefile property
is set to none, zdb fails to show the pool unless we specify the
cache file or use the -e option. This PR automates this process.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Akash B <akash-b@hpe.com>
Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
Closes openzfs#16071
    @ixhamza
    ixhamza committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    b39b428 View commit details
    Browse the repository at this point in the history

  3. zdb: fix FreeBSD build failure 

    This fixes FreeBSD build failure with clang-18 after 23a489a got merged.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Rob Norris <rob.norris@klarasystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>
Closes openzfs#16252
    @ixhamza
    ixhamza committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    680a1f5 View commit details
    Browse the repository at this point in the history

  4. Fix assertion in Persistent L2ARC 

    At the end of l2arc_evict() fix an assertion in the case that l2ad_hand
+ distance == l2ad_end.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: George Amanakis <gamanakis@gmail.com>
Closes openzfs#16202
Closes openzfs#16207
    @gamanakis @ixhamza
    gamanakis authored and ixhamza committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    43f7082 View commit details
    Browse the repository at this point in the history