zpool_influxdb: move to libexec dir

Move the zpool_influxdb command to /usr/libexec/zfs, and include the /usr/libexec/zfs path in the system search directory when running the test suite. Reviewed-by: Richard Elling <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Pavel Snajdr <[email protected]> Closes openzfs#11156 Closes openzfs#11160 Closes openzfs#11224
tonyhutter · Jun 11, 2021 · d6f9d5e · d6f9d5e
1 parent 9ef41ec
commit d6f9d5e
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/cmd/zpool_influxdb/Makefile.am b/cmd/zpool_influxdb/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/Rules.am
 
-bin_PROGRAMS = zpool_influxdb
+zfsexec_PROGRAMS = zpool_influxdb
 
 zpool_influxdb_SOURCES = \
 	zpool_influxdb.c

diff --git a/cmd/zpool_influxdb/README.md b/cmd/zpool_influxdb/README.md
@@ -237,7 +237,7 @@ be restarted to read the config-directory files.
 # # Read metrics from zpool_influxdb
 [[inputs.execd]]
 #   ## default installation location for zpool_influxdb command
-  command = ["/usr/bin/zpool_influxdb", "--execd"]
+  command = ["/usr/libexec/zfs/zpool_influxdb", "--execd"]
 
     ## Define how the process is signaled on each collection interval.
     ## Valid values are:
@@ -264,7 +264,7 @@ be restarted to read the config-directory files.
 # # Read metrics from zpool_influxdb
 [[inputs.exec]]
 #   ## default installation location for zpool_influxdb command
-  commands = ["/usr/bin/zpool_influxdb"]
+  commands = ["/usr/libexec/zfs/zpool_influxdb"]
   data_format = "influx"
 ```
 

diff --git a/cmd/zpool_influxdb/telegraf.d/exec_zpool_influxdb.conf b/cmd/zpool_influxdb/telegraf.d/exec_zpool_influxdb.conf
@@ -1,7 +1,7 @@
 # # Read metrics from zpool_influxdb
 [[inputs.exec]]
 #   ## default installation location for zpool_influxdb command
-  commands = ["/usr/local/bin/zpool_influxdb"]
+  commands = ["/usr/local/libexec/zfs/zpool_influxdb"]
 #   ## Timeout for each command to complete.
 #   timeout = "5s"
 #

diff --git a/cmd/zpool_influxdb/telegraf.d/execd_zpool_influxdb.conf b/cmd/zpool_influxdb/telegraf.d/execd_zpool_influxdb.conf
@@ -1,7 +1,7 @@
 # # Read metrics from zpool_influxdb
 [[inputs.execd]]
 #   ## default installation location for zpool_influxdb command
-  command = ["/usr/local/bin/zpool_influxdb", "--execd"]
+  command = ["/usr/local/libexec/zfs/zpool_influxdb", "--execd"]
 
     ## Define how the process is signaled on each collection interval.
     ## Valid values are:

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
@@ -444,7 +444,6 @@ systemctl --system daemon-reload >/dev/null || true
 %{_bindir}/raidz_test
 %{_sbindir}/zgenhostid
 %{_bindir}/zvol_wait
-%{_bindir}/zpool_influxdb
 # Optional Python 2/3 scripts
 %{_bindir}/arc_summary
 %{_bindir}/arcstat

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -60,6 +60,7 @@ export EXTRA_ENVIRONMENT
 all-local:
 	-$(SED) -e '\|^export BIN_DIR=|s|$$|@abs_top_builddir@/bin|' \
 		-e '\|^export SBIN_DIR=|s|$$|@abs_top_builddir@/bin|' \
+		-e '\|^export LIBEXEC_DIR=|s|$$|@abs_top_builddir@/bin|' \
 		-e '\|^export ZTS_DIR=|s|$$|@abs_top_srcdir@/tests|' \
 		-e '\|^export SCRIPT_DIR=|s|$$|@abs_top_srcdir@/scripts|' \
 		$(abs_top_srcdir)/scripts/common.sh.in >common.sh
@@ -71,6 +72,7 @@ clean-local:
 install-data-hook:
 	-$(SED) -e '\|^export BIN_DIR=|s|$$|@bindir@|' \
 		-e '\|^export SBIN_DIR=|s|$$|@sbindir@|' \
+		-e '\|^export LIBEXEC_DIR=|s|$$|@zfsexecdir@|' \
 		-e '\|^export ZTS_DIR=|s|$$|@datadir@/@PACKAGE@|' \
 		-e '\|^export SCRIPT_DIR=|s|$$|@datadir@/@PACKAGE@|' \
 		$(abs_top_srcdir)/scripts/common.sh.in \

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
@@ -3,6 +3,7 @@
 # Directories
 export BIN_DIR=
 export SBIN_DIR=
+export LIBEXEC_DIR=
 export ZTS_DIR=
 export SCRIPT_DIR=
 

diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh
@@ -242,7 +242,7 @@ constrain_path() {
 	# install to /usr/local/sbin. To avoid testing the wrong utils we
 	# need /usr/local to come before / in the path search order.
 	SYSTEM_DIRS="/usr/local/bin /usr/local/sbin"
-	SYSTEM_DIRS="$SYSTEM_DIRS /usr/bin /usr/sbin /bin /sbin"
+	SYSTEM_DIRS="$SYSTEM_DIRS /usr/bin /usr/sbin /bin /sbin $LIBEXEC_DIR"
 
 	if [ "$INTREE" = "yes" ]; then
 		# Constrained path set to ./zfs/bin/