diff options
author | Alexander Motin <mav@FreeBSD.org> | 2019-06-03 19:15:06 +0000 |
---|---|---|
committer | Alexander Motin <mav@FreeBSD.org> | 2019-06-03 19:15:06 +0000 |
commit | ce88141b274fbc7bab015938bcb07c1b1c9f0558 (patch) | |
tree | 7aa793a7797e9d29cd0cfd0c3ac395e086dc2e3b /cddl/contrib/opensolaris/cmd/zfs/zfs.8 | |
parent | 63acab6a5bc61b9d47d03f21d339fa4dda6779e0 (diff) | |
parent | 1425be644a4b132c371589ffb6f83dc10b4ee59e (diff) | |
download | src-ce88141b274fbc7bab015938bcb07c1b1c9f0558.tar.gz src-ce88141b274fbc7bab015938bcb07c1b1c9f0558.zip |
MFV r348568: 9466 add JSON output support to channel programs
illumos/illumos-gate@5267591016146502784860802129b16dab6f135c
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com>
Reviewed by: Sara Hartse <sara.hartse@delphix.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Author: Alek Pinchuk <apinchuk@datto.com>
Notes
Notes:
svn path=/head/; revision=348570
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs/zfs.8')
-rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs.8 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8 index 3656f799ea98..d90bec46d06a 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8 @@ -29,6 +29,7 @@ .\" Copyright (c) 2014, Xin LI <delphij@FreeBSD.org> .\" Copyright (c) 2014-2015, The FreeBSD Foundation, All Rights Reserved. .\" Copyright 2018 Joyent, Inc. +.\" Copyright (c) 2018 Datto Inc. .\" .\" $FreeBSD$ .\" @@ -291,7 +292,7 @@ .Op Ar snapshot Ns | Ns Ar filesystem .Nm .Cm program -.Op Fl n +.Op Fl jn .Op Fl t Ar timeout .Op Fl m Ar memory_limit .Ar pool script @@ -3364,7 +3365,7 @@ Display the path's inode change time as the first column of output. .It Xo .Nm .Cm program -.Op Fl n +.Op Fl jn .Op Fl t Ar timeout .Op Fl m Ar memory_limit .Ar pool script @@ -3387,6 +3388,11 @@ For full documentation of the ZFS channel program interface, see the manual page for .Xr zfs-program 8 . .Bl -tag -width indent +.It Fl j +Display channel program output in JSON format. +When this flag is specified and standard output is empty - +channel program encountered an error. +The details of such an error will be printed to standard error in plain text. .It Fl n Executes a read-only channel program, which runs faster. The program cannot change on-disk state by calling functions from |