Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <Richard.Elling@RichardElling.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Pavel Snajdr <snajpa@snajpa.net>
Closes #11156
Closes #11160
Closes #11224
This commit is contained in:
Pavel Snajdr 2020-11-28 20:15:57 +01:00 committed by GitHub
parent b2a54a28b5
commit 52c8537513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zpool_influxdb/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
bin_PROGRAMS = zpool_influxdb zfsexec_PROGRAMS = zpool_influxdb
zpool_influxdb_SOURCES = \ zpool_influxdb_SOURCES = \
zpool_influxdb.c zpool_influxdb.c

4
cmd/zpool_influxdb/README.md
View File

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

2
cmd/zpool_influxdb/telegraf.d/exec_zpool_influxdb.conf
View File

@ -1,7 +1,7 @@
# # Read metrics from zpool_influxdb # # Read metrics from zpool_influxdb
[[inputs.exec]] [[inputs.exec]]
# ## default installation location for zpool_influxdb command # ## 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 for each command to complete.
# timeout = "5s" # timeout = "5s"
# #

2
cmd/zpool_influxdb/telegraf.d/execd_zpool_influxdb.conf
View File

@ -1,7 +1,7 @@
# # Read metrics from zpool_influxdb # # Read metrics from zpool_influxdb
[[inputs.execd]] [[inputs.execd]]
# ## default installation location for zpool_influxdb command # ## 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. ## Define how the process is signaled on each collection interval.
## Valid values are: ## Valid values are:

1
rpm/generic/zfs.spec.in
View File

@ -444,7 +444,6 @@ systemctl --system daemon-reload >/dev/null || true
%{_bindir}/raidz_test %{_bindir}/raidz_test
%{_bindir}/zgenhostid %{_bindir}/zgenhostid
%{_bindir}/zvol_wait %{_bindir}/zvol_wait
%{_bindir}/zpool_influxdb
# Optional Python 2/3 scripts # Optional Python 2/3 scripts
%{_bindir}/arc_summary %{_bindir}/arc_summary
%{_bindir}/arcstat %{_bindir}/arcstat

2
scripts/Makefile.am
View File

@ -61,6 +61,7 @@ export EXTRA_ENVIRONMENT
all-local: all-local:
-$(SED) -e '\|^export BIN_DIR=|s|$$|@abs_top_builddir@/bin|' \ -$(SED) -e '\|^export BIN_DIR=|s|$$|@abs_top_builddir@/bin|' \
-e '\|^export SBIN_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 ZTS_DIR=|s|$$|@abs_top_srcdir@/tests|' \
-e '\|^export SCRIPT_DIR=|s|$$|@abs_top_srcdir@/scripts|' \ -e '\|^export SCRIPT_DIR=|s|$$|@abs_top_srcdir@/scripts|' \
$(abs_top_srcdir)/scripts/common.sh.in >common.sh $(abs_top_srcdir)/scripts/common.sh.in >common.sh
@ -72,6 +73,7 @@ clean-local:
install-data-hook: install-data-hook:
-$(SED) -e '\|^export BIN_DIR=|s|$$|@bindir@|' \ -$(SED) -e '\|^export BIN_DIR=|s|$$|@bindir@|' \
-e '\|^export SBIN_DIR=|s|$$|@sbindir@|' \ -e '\|^export SBIN_DIR=|s|$$|@sbindir@|' \
-e '\|^export LIBEXEC_DIR=|s|$$|@zfsexecdir@|' \
-e '\|^export ZTS_DIR=|s|$$|@datadir@/@PACKAGE@|' \ -e '\|^export ZTS_DIR=|s|$$|@datadir@/@PACKAGE@|' \
-e '\|^export SCRIPT_DIR=|s|$$|@datadir@/@PACKAGE@|' \ -e '\|^export SCRIPT_DIR=|s|$$|@datadir@/@PACKAGE@|' \
$(abs_top_srcdir)/scripts/common.sh.in \ $(abs_top_srcdir)/scripts/common.sh.in \

1
scripts/common.sh.in
View File

@ -3,6 +3,7 @@
# Directories # Directories
export BIN_DIR= export BIN_DIR=
export SBIN_DIR= export SBIN_DIR=
export LIBEXEC_DIR=
export ZTS_DIR= export ZTS_DIR=
export SCRIPT_DIR= export SCRIPT_DIR=

2
scripts/zfs-tests.sh
View File

@ -242,7 +242,7 @@ constrain_path() {
# install to /usr/local/sbin. To avoid testing the wrong utils we # install to /usr/local/sbin. To avoid testing the wrong utils we
# need /usr/local to come before / in the path search order. # need /usr/local to come before / in the path search order.
SYSTEM_DIRS="/usr/local/bin /usr/local/sbin" 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 if [ "$INTREE" = "yes" ]; then
# Constrained path set to ./zfs/bin/ # Constrained path set to ./zfs/bin/