Simplify diagnostic kstat for pool status

This commit updates the kstat for pool status and simplifies by creating an nvlist that contains the pool status. This nvlist is then printed to provided buffer in JSON format. The redundant parts of code have also been removed. Signed-off-by: Umer Saleem <[email protected]>
truenas · Oct 24, 2024 · 640c353 · 640c353
1 parent 2ad5b24
commit 640c353
Show file tree

Hide file tree

Showing 10 changed files with 819 additions and 1,043 deletions.
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -176,7 +176,6 @@ COMMON_H = \
 
 
 KERNEL_H = \
-	sys/jprint.h \
 	sys/spa_json_stats.h \
 	sys/zfs_ioctl.h \
 	sys/zfs_ioctl_impl.h \

diff --git a/include/sys/jprint.h b/include/sys/jprint.h
diff --git a/include/sys/nvpair.h b/include/sys/nvpair.h
@@ -213,6 +213,8 @@ _SYS_NVPAIR_H int nvlist_remove(nvlist_t *, const char *, data_type_t);
 _SYS_NVPAIR_H int nvlist_remove_all(nvlist_t *, const char *);
 _SYS_NVPAIR_H int nvlist_remove_nvpair(nvlist_t *, nvpair_t *);
 
+_SYS_NVPAIR_H int nvlist_to_json(nvlist_t *, char **, size_t);
+
 _SYS_NVPAIR_H int nvlist_lookup_boolean(const nvlist_t *, const char *);
 _SYS_NVPAIR_H int nvlist_lookup_boolean_value(const nvlist_t *, const char *,
     boolean_t *);

diff --git a/lib/libnvpair/libnvpair.abi b/lib/libnvpair/libnvpair.abi
@@ -118,6 +118,7 @@
     <elf-symbol name='nvlist_empty' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nvlist_exists' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nvlist_free' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='nvlist_to_json' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nvlist_lookup_boolean' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nvlist_lookup_boolean_array' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nvlist_lookup_boolean_value' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -2951,6 +2952,12 @@
       <parameter type-id='3fa542f0' name='nvp'/>
       <return type-id='95e97e5e'/>
     </function-decl>
+    <function-decl name='nvlist_to_json' mangled-name='nvlist_to_json' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_to_json'>
+      <parameter type-id='5ce45b60' name='nvl'/>
+      <parameter type-id='9b23c9ad' name='buf'/>
+      <parameter type-id='b59d7dce' name='size'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='nvlist_add_boolean' mangled-name='nvlist_add_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean'>
       <parameter type-id='5ce45b60' name='nvl'/>
       <parameter type-id='80f4b756' name='name'/>

diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
@@ -113,7 +113,6 @@ nodist_libzpool_la_SOURCES = \
 	module/zfs/fm.c \
 	module/zfs/gzip.c \
 	module/zfs/hkdf.c \
-	module/zfs/jprint.c \
 	module/zfs/lz4.c \
 	module/zfs/lz4_zfs.c \
 	module/zfs/lzjb.c \

diff --git a/module/Kbuild.in b/module/Kbuild.in
@@ -356,7 +356,6 @@ ZFS_OBJS := \
 	fm.o \
 	gzip.o \
 	hkdf.o \
-	jprint.o \
 	lz4.o \
 	lz4_zfs.o \
 	lzjb.o \

diff --git a/module/Makefile.bsd b/module/Makefile.bsd
@@ -284,7 +284,6 @@ SRCS+=	abd.c \
 	edonr_zfs.c \
 	fm.c \
 	gzip.c \
-	jprint.c \
 	lz4.c \
 	lz4_zfs.c \
 	lzjb.c \