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

Remove renaming notice and symlinks for arcstat and arc_summary

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Colm Buckley <colm@tuatha.org>
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
Closes #16357
Closes #17712
This commit is contained in:
Shengqi Chen 2025-09-09 17:46:40 +08:00 committed by Brian Behlendorf
parent dc53e5c484
commit 5bf1500ee3
7 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/Makefile.am
View File

@ -107,11 +107,6 @@ $(call SUBST,dbufstat,%D%/)
$(call SUBST,zilstat,%D%/)
arc_summary: %D%/arc_summary
$(AM_V_at)cp $< $@
cmd-rename-install-exec-hook:
$(LN_S) -f arcstat $(DESTDIR)$(bindir)/zarcstat
$(LN_S) -f arc_summary $(DESTDIR)$(bindir)/zarcsummary
INSTALL_EXEC_HOOKS += cmd-rename-install-exec-hook
endif
PHONY += cmd

7
cmd/arc_summary
View File

@ -1021,13 +1021,6 @@ def main():
treated separately because they come with their own call.
"""
# notify user for upcoming renaming in 2.4.0
abs_path = os.path.abspath(sys.argv[0].strip())
script_name = os.path.basename(abs_path)
if script_name != "zarcsummary":
sys.stderr.write("Note: this script will be renamed to zarcsummary in ")
sys.stderr.write("zfs 2.4.0. Please migrate ASAP.\n")
kstats = get_kstats()
if ARGS.graph:

7
cmd/arcstat.in
View File

@ -768,13 +768,6 @@ def calculate():
def main():
# notify user for upcoming renaming in 2.4.0
abs_path = os.path.abspath(sys.argv[0].strip())
script_name = os.path.basename(abs_path)
if script_name != "zarcstat":
sys.stderr.write("Note: this script will be renamed to zarcstat in ")
sys.stderr.write("zfs 2.4.0. Please migrate ASAP.\n")
global sint
global count
global hdr_intr

2
contrib/debian/openzfs-zfsutils.install
View File

@ -37,9 +37,7 @@ usr/lib/zfs-linux/zpool.d/
usr/lib/zfs-linux/zpool_influxdb
usr/lib/zfs-linux/zfs_prepare_disk
usr/sbin/arc_summary
usr/sbin/zarcsummary
usr/sbin/arcstat
usr/sbin/zarcstat
usr/sbin/dbufstat
usr/sbin/zilstat
usr/share/zfs/compatibility.d/

2
contrib/debian/rules.in
View File

@ -82,9 +82,7 @@ override_dh_auto_install:
# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
mv '$(CURDIR)/debian/tmp/usr/bin/zarcsummary' '$(CURDIR)/debian/tmp/usr/sbin/zarcsummary'
mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
mv '$(CURDIR)/debian/tmp/usr/bin/zarcstat' '$(CURDIR)/debian/tmp/usr/sbin/zarcstat'
mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
mv '$(CURDIR)/debian/tmp/usr/bin/zilstat' '$(CURDIR)/debian/tmp/usr/sbin/zilstat'

2
man/man1/arcstat.1
View File

@ -20,8 +20,6 @@
.Sh NAME
.Nm arcstat
.Nd report ZFS ARC and L2ARC statistics
.Sh NOTICE
It will be renamed to zarcstat in zfs 2.4.0. Please migrate ASAP.
.Sh SYNOPSIS
.Nm
.Op Fl havxp

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

@ -509,9 +509,7 @@ systemctl --system daemon-reload >/dev/null || true
%{_bindir}/zvol_wait
# Optional Python 3 scripts
%{_bindir}/arc_summary
%{_bindir}/zarcsummary
%{_bindir}/arcstat
%{_bindir}/zarcstat
%{_bindir}/dbufstat
%{_bindir}/zilstat
# Man pages