OpenZFS 9164 - assert: newds == os->os_dsl_dataset

[dinatale2]

Authored by: Andriy Gapon [email protected]
Reviewed by: Matt Ahrens [email protected]
Reviewed by: Don Brady [email protected]
Approved by: Richard Lowe [email protected]
Ported-by: Giuseppe Di Natale [email protected]

OpenZFS-issue: https://www.illumos.org/issues/9164
OpenZFS-commit: openzfs/openzfs@0e776dc06a

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.

[loli10K]

This should fix #6112.

[behlendorf]

@loli10K thanks for point out #6112.
@dinatale2 please update this PR to re-enable cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh and we'll see if all is well.

[behlendorf]

The updated fix looks good, but we should run down this warning from the newly enable test case.

20:08:07.76 /usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh[64]: default_check_zfs_upgrade: line 155: -: more tokens expected

[loli10K]

"-" is not a valid number and we can't assign it to an integer (typeset -i):

root@linux:~# zpool list
NAME       SIZE  ALLOC   FREE  EXPANDSZ   FRAG    CAP  DEDUP  HEALTH  ALTROOT
testpool   112M   102K   112M         -     0%     0%  1.00x  ONLINE  -
root@linux:~# zpool get version
NAME      PROPERTY  VALUE    SOURCE
testpool  version   -        default
root@linux:~# ksh
# typeset -i vp=0
# vp=$(zpool get version -H -p -o value testpool)
ksh: -: more tokens expected
# str=$(zpool get version -H -p -o value testpool)
# 
root@linux:~# 

Tested on ksh version "93u+20120801-1" (Debian8).

Somehow this doesn't seem to affect Illumos: i am going to try and do some more testing on my OpenIndiana development box later today.

[loli10K]

Somehow this doesn't seem to affect Illumos

This does affect Illumos: my test box has "/" on ZFS

https://github.com/zfsonlinux/zfs/blob/668173b5764386b47de0beb7c57ff8ce8f68f983/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib#L129-L130

in which case the following block of code gets skipped (vp=$(get_pool_prop version $pool))

https://github.com/zfsonlinux/zfs/blob/668173b5764386b47de0beb7c57ff8ce8f68f983/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib#L151-L163

[dinatale2]

@loli10K That explains it... I wasn't concerned about the assignment. I clearly should have been.

It might look messy, but I could use a temp variable and check for -. That means default and I think the default version is currently 5. Am I wrong?

[loli10K]

@dinatale2 i think that should work. Also we should probably wrap those "log_must (zfs|zpool) upgrade >/dev/null" with eval to avoid losing log_must output.

[codecov]

Codecov Report

Merging #7336 into master will decrease coverage by 0.04%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #7336      +/-   ##
==========================================
- Coverage   76.35%   76.31%   -0.05%     
==========================================
  Files         329      329              
  Lines      104191   104188       -3     
==========================================
- Hits        79560    79508      -52     
- Misses      24631    24680      +49

Flag	Coverage Δ
#kernel	76.4% <100%> (+0.13%)	⬆️
#user	65.6% <0%> (-0.12%)	⬇️

---

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 13a2ff2...66083e8. Read the comment docs.

[loli10K]

I'm sorry for derailing this, i was wrongfully thinking of filesystem version, not pool version.

[dinatale2]

@loli10K You didn't derail anything. Thank you for your assistance! :)