c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove requirement for -d 1 for zfs list and zfs get with bookmarks

Browse Source 
df58307 removed the need to specify -d 1 when zfs list and zfs get are
called with -t snapshot on a datset. This commit extends the same
behaviour to -t bookmark.

This commit also introduces the 'snap' shorthand for snapshots from
zfs list to zfs get.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tom Caputi <tcaputi@datto.com>
Reviewed-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
Closes #9589
This commit is contained in:
InsanePrawn
2019-11-19 01:44:28 +01:00
committed by Brian Behlendorf
parent 7ae3f8dc8f
commit 8221bcf1e4
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_009_pos.ksh
+11
View File
@@ -92,5 +92,16 @@ log_must eval "zfs get -H -t snapshot -o name creation $DEPTH_FS > $DEPTH_OUTPUT
log_must eval "zfs get -H -t snapshot -d 1 -o name creation $DEPTH_FS > $EXPECT_OUTPUT"
log_must diff $DEPTH_OUTPUT $EXPECT_OUTPUT
# Ensure 'zfs get -t snap' works as a shorthand for 'zfs get -t snapshot'
log_must eval "zfs get -H -t snap -d 1 -o name creation $DEPTH_FS > $DEPTH_OUTPUT"
log_must eval "zfs get -H -t snapshot -d 1 -o name creation $DEPTH_FS > $EXPECT_OUTPUT"
log_must diff $DEPTH_OUTPUT $EXPECT_OUTPUT
# Ensure 'zfs get -t bookmark <dataset>' works as though -d 1 was specified
log_must eval "zfs get -H -t bookmark -o name creation $DEPTH_FS > $DEPTH_OUTPUT"
log_must eval "zfs get -H -t bookmark -d 1 -o name creation $DEPTH_FS > $EXPECT_OUTPUT"
log_must diff $DEPTH_OUTPUT $EXPECT_OUTPUT
log_pass "'zfs get -d <n>' should get expected output."
tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
+2 -1
View File
@@ -37,7 +37,7 @@ set -A depth_options "d 0" "d 1" "d 2" "d 4" "d 32"
set -A depth_array 0 1 2 4 32
#
# Setup multiple depths datasets, including fs, volume and snapshot.
# Setup multiple depths datasets, including fs, volumes, snapshots and bookmarks.
#
function depth_fs_setup
{
@@ -65,6 +65,7 @@ function depth_fs_setup
log_must zfs create -V 8M $fs/vol_"$j"_depth"$i"
fi
log_must zfs snapshot $fs@snap_"$j"_depth"$i"
log_must zfs bookmark $fs@snap_"$j"_depth"$i" '#bookmark'_"$j"_depth"$i"
(( j=j+1 ))
done
done