diff options
author | Scott Mayhew <smayhew@redhat.com> | 2014-10-20 15:35:45 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2014-12-13 10:40:28 -0500 |
commit | da37c2b86ac19aac1716f72bf0000824b03960c4 (patch) | |
tree | ec52539661a676ef68f7feb98c843b76aff716e6 /tools/mountstats | |
parent | 935011c48824f55a14989ad1eba96cc07660517c (diff) | |
download | nfs-utils-da37c2b86ac19aac1716f72bf0000824b03960c4.tar.gz |
mountstats: Refactor compare_iostats
Iterate over the newly added counters instead of using repeated
assignment statements. Also compute the difference of every counter
where it makes sense -- this will allow support for -S/--since to be
implemented in the future.
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'tools/mountstats')
-rw-r--r-- | tools/mountstats/mountstats.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py index a129d61..912d31a 100644 --- a/tools/mountstats/mountstats.py +++ b/tools/mountstats/mountstats.py @@ -415,7 +415,11 @@ class DeviceData: def compare_iostats(self, old_stats): """Return the difference between two sets of stats """ + if old_stats.__nfs_data['age'] > self.__nfs_data['age']: + return self + result = DeviceData() + protocol = self.__rpc_data['protocol'] # copy self into result for key, value in self.__nfs_data.items(): @@ -430,12 +434,21 @@ class DeviceData: for op in result.__rpc_data['ops']: result.__rpc_data[op] = list(map(difference, self.__rpc_data[op], old_stats.__rpc_data[op])) - # update the remaining keys we care about - result.__rpc_data['rpcsends'] -= old_stats.__rpc_data['rpcsends'] - result.__rpc_data['backlogutil'] -= old_stats.__rpc_data['backlogutil'] - result.__nfs_data['serverreadbytes'] -= old_stats.__nfs_data['serverreadbytes'] - result.__nfs_data['serverwritebytes'] -= old_stats.__nfs_data['serverwritebytes'] - + # update the remaining keys + if protocol == 'udp': + for key in XprtUdpCounters: + result.__rpc_data[key] -= old_stats.__rpc_data[key] + elif protocol == 'tcp': + for key in XprtTcpCounters: + result.__rpc_data[key] -= old_stats.__rpc_data[key] + elif protocol == 'rdma': + for key in XprtRdmaCounters: + result.__rpc_data[key] -= old_stats.__rpc_data[key] + result.__nfs_data['age'] -= old_stats.__nfs_data['age'] + for key in NfsEventCounters: + result.__nfs_data[key] -= old_stats.__nfs_data[key] + for key in NfsByteCounters: + result.__nfs_data[key] -= old_stats.__nfs_data[key] return result def display_iostats(self, sample_time): |