Minor code cleanups in arc_python.py

Remove unused library re and associated variable kstat_pobj. Add note
to documentation at start of program about required support for old
versions of Python. Change variable "format" (which is a built-in
function) to "fmt".

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Scot W. Stevenson <scot.stevenson@gmail.com>
Closes #6869
This commit is contained in:
Scot W. Stevenson 2017-11-15 19:28:11 +01:00 committed by Brian Behlendorf
parent 454365bbaa
commit e301113c17

View File

@ -31,6 +31,10 @@
# #
# If you are having troubles when using this script from cron(8) please try # If you are having troubles when using this script from cron(8) please try
# adjusting your PATH before reporting problems. # adjusting your PATH before reporting problems.
#
# Note some of this code uses older code (eg getopt instead of argparse,
# subprocess.Popen() instead of subprocess.run()) because we need to support
# some very old versions of Python.
"""Print statistics on the ZFS Adjustable Replacement Cache (ARC) """Print statistics on the ZFS Adjustable Replacement Cache (ARC)
Provides basic information on the ARC, its efficiency, the L2ARC (if present), Provides basic information on the ARC, its efficiency, the L2ARC (if present),
@ -41,7 +45,6 @@ https://github.com/zfsonlinux/zfs/blob/master/module/zfs/arc.c for details.
import getopt import getopt
import os import os
import re
import sys import sys
import time import time
@ -50,7 +53,6 @@ from decimal import Decimal as D
show_tunable_descriptions = False show_tunable_descriptions = False
alternate_tunable_layout = False alternate_tunable_layout = False
kstat_pobj = re.compile("^([^:]+):\s+(.+)\s*$", flags=re.M)
def get_Kstat(): def get_Kstat():
@ -911,9 +913,9 @@ def _tunable_summary(Kstat):
names.sort() names.sort()
if alternate_tunable_layout: if alternate_tunable_layout:
format = "\t%s=%s\n" fmt = "\t%s=%s\n"
else: else:
format = "\t%-50s%s\n" fmt = "\t%-50s%s\n"
for name in names: for name in names:
@ -923,7 +925,7 @@ def _tunable_summary(Kstat):
if show_tunable_descriptions and name in descriptions: if show_tunable_descriptions and name in descriptions:
sys.stdout.write("\t# %s\n" % descriptions[name]) sys.stdout.write("\t# %s\n" % descriptions[name])
sys.stdout.write(format % (name, values[name])) sys.stdout.write(fmt % (name, values[name]))
unSub = [ unSub = [