38 lines
1.8 KiB
Diff
38 lines
1.8 KiB
Diff
|
diff -up nfs-utils-2.3.3/tools/mountstats/mountstats.py.orig nfs-utils-2.3.3/tools/mountstats/mountstats.py
|
||
|
|
--- nfs-utils-2.3.3/tools/mountstats/mountstats.py.orig 2020-12-10 10:48:17.319579958 -0500
|
||
|
|
+++ nfs-utils-2.3.3/tools/mountstats/mountstats.py 2020-12-10 10:52:42.481484160 -0500
|
||
|
|
@@ -943,10 +943,11 @@ def print_iostat_summary(old, new, devic
|
||
|
|
if not old or device not in old:
|
||
|
|
stats.display_iostats(time)
|
||
|
|
else:
|
||
|
|
- old_stats = DeviceData()
|
||
|
|
- old_stats.parse_stats(old[device])
|
||
|
|
- diff_stats = stats.compare_iostats(old_stats)
|
||
|
|
- diff_stats.display_iostats(time)
|
||
|
|
+ if ("fstype autofs" not in str(old[device])) and ("fstype autofs" not in str(new[device])):
|
||
|
|
+ old_stats = DeviceData()
|
||
|
|
+ old_stats.parse_stats(old[device])
|
||
|
|
+ diff_stats = stats.compare_iostats(old_stats)
|
||
|
|
+ diff_stats.display_iostats(time)
|
||
|
|
|
||
|
|
def iostat_command(args):
|
||
|
|
"""iostat-like command for NFS mount points
|
||
|
|
diff -up nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py.orig nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py
|
||
|
|
--- nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py.orig 2020-12-10 10:48:17.316579880 -0500
|
||
|
|
+++ nfs-utils-2.3.3/tools/nfs-iostat/nfs-iostat.py 2020-12-10 10:52:42.481484160 -0500
|
||
|
|
@@ -467,10 +467,13 @@ def parse_stats_file(filename):
|
||
|
|
def print_iostat_summary(old, new, devices, time, options):
|
||
|
|
stats = {}
|
||
|
|
diff_stats = {}
|
||
|
|
+ devicelist = []
|
||
|
|
if old:
|
||
|
|
# Trim device list to only include intersection of old and new data,
|
||
|
|
# this addresses umounts due to autofs mountpoints
|
||
|
|
- devicelist = [x for x in old if x in devices]
|
||
|
|
+ for device in devices:
|
||
|
|
+ if "fstype autofs" not in str(old[device]):
|
||
|
|
+ devicelist.append(device)
|
||
|
|
else:
|
||
|
|
devicelist = devices
|
||
|
|
|