From patchwork Wed Nov 26 19:13:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 5387541 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6F2F3C11AC for ; Wed, 26 Nov 2014 19:14:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62EB9201FB for ; Wed, 26 Nov 2014 19:14:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47E7B201FE for ; Wed, 26 Nov 2014 19:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751156AbaKZTOF (ORCPT ); Wed, 26 Nov 2014 14:14:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57327 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752026AbaKZTOB (ORCPT ); Wed, 26 Nov 2014 14:14:01 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAQJE11g006126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 26 Nov 2014 14:14:01 -0500 Received: from tonberry.usersys.redhat.com (dhcp145-188.rdu.redhat.com [10.13.145.188]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAQJE0Mv023659 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 26 Nov 2014 14:14:01 -0500 Received: from tonberry.usersys.redhat.com (localhost [127.0.0.1]) by tonberry.usersys.redhat.com (8.14.8/8.14.5) with ESMTP id sAQJE0Gb037765 for ; Wed, 26 Nov 2014 14:14:00 -0500 Received: (from smayhew@localhost) by tonberry.usersys.redhat.com (8.14.8/8.14.8/Submit) id sAQJE0gN037763 for linux-nfs@vger.kernel.org; Wed, 26 Nov 2014 14:14:00 -0500 From: Scott Mayhew To: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH v2 12/17] mountstats: Add support for -R/--raw to mountstats_command Date: Wed, 26 Nov 2014 14:13:50 -0500 Message-Id: <1417029235-37675-13-git-send-email-smayhew@redhat.com> In-Reply-To: <1417029235-37675-1-git-send-email-smayhew@redhat.com> References: <1417029235-37675-1-git-send-email-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This option displays the mountstats in raw format (i.e. in the same format as /proc/self/mountstats). It's intended to be used mainly with the -S/--since option. Signed-off-by: Scott Mayhew --- tools/mountstats/mountstats.py | 47 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py index d09096f..a1ce8f4 100644 --- a/tools/mountstats/mountstats.py +++ b/tools/mountstats/mountstats.py @@ -305,6 +305,41 @@ class DeviceData: return True return False + def display_raw_stats(self): + """Prints out stats in the same format as /proc/self/mountstats + """ + print('device %s mounted on %s with fstype %s %s' % \ + (self.__nfs_data['export'], self.__nfs_data['mountpoint'], \ + self.__nfs_data['fstype'], self.__nfs_data['statvers'])) + print('\topts:\t%s' % ','.join(self.__nfs_data['mountoptions'])) + print('\tage:\t%d' % self.__nfs_data['age']) + print('\tcaps:\t%s' % ','.join(self.__nfs_data['servercapabilities'])) + print('\tsec:\tflavor=%d,pseudoflavor=%d' % (self.__nfs_data['flavor'], \ + self.__nfs_data['pseudoflavor'])) + print('\tevents:\t%s' % " ".join([str(self.__nfs_data[key]) for key in NfsEventCounters])) + print('\tbytes:\t%s' % " ".join([str(self.__nfs_data[key]) for key in NfsByteCounters])) + print('\tRPC iostats version: %1.1f p/v: %s (nfs)' % (self.__rpc_data['statsvers'], \ + self.__rpc_data['programversion'])) + if self.__rpc_data['protocol'] == 'udp': + print('\txprt:\tudp %s' % " ".join([str(self.__rpc_data[key]) for key in XprtUdpCounters])) + elif self.__rpc_data['protocol'] == 'tcp': + print('\txprt:\ttcp %s' % " ".join([str(self.__rpc_data[key]) for key in XprtTcpCounters])) + elif self.__rpc_data['protocol'] == 'rdma': + print('\txprt:\trdma %s' % " ".join([str(self.__rpc_data[key]) for key in XprtRdmaCounters])) + else: + raise Exception('Unknown RPC transport protocol %s' % self.__rpc_data['protocol']) + print('\tper-op statistics') + prog, vers = self.__rpc_data['programversion'].split('/') + if vers == '3': + for op in Nfsv3ops: + print('\t%12s: %s' % (op, " ".join(str(x) for x in self.__rpc_data[op]))) + elif vers == '4': + for op in Nfsv4ops: + print('\t%12s: %s' % (op, " ".join(str(x) for x in self.__rpc_data[op]))) + else: + print('\tnot implemented for version %d' % vers) + print() + def display_stats_header(self): print('Stats for %s mounted on %s:' % \ (self.__nfs_data['export'], self.__nfs_data['mountpoint'])) @@ -551,7 +586,7 @@ def parse_stats_file(f): return ms_dict -def print_mountstats(stats, nfs_only, rpc_only): +def print_mountstats(stats, nfs_only, rpc_only, raw): if nfs_only: stats.display_nfs_options() stats.display_nfs_events() @@ -560,6 +595,8 @@ def print_mountstats(stats, nfs_only, rpc_only): stats.display_stats_header() stats.display_rpc_generic_stats() stats.display_rpc_op_stats() + elif raw: + stats.display_raw_stats() else: stats.display_nfs_options() stats.display_nfs_bytes() @@ -602,14 +639,14 @@ def mountstats_command(args): stats = DeviceData() stats.parse_stats(mountstats[mp]) if not args.since: - print_mountstats(stats, args.nfs_only, args.rpc_only) + print_mountstats(stats, args.nfs_only, args.rpc_only, args.raw) elif args.since and mp not in old_mountstats: - print_mountstats(stats, args.nfs_only, args.rpc_only) + print_mountstats(stats, args.nfs_only, args.rpc_only, args.raw) else: old_stats = DeviceData() old_stats.parse_stats(old_mountstats[mp]) diff_stats = stats.compare_iostats(old_stats) - print_mountstats(diff_stats, args.nfs_only, args.rpc_only) + print_mountstats(diff_stats, args.nfs_only, args.rpc_only, args.raw) args.infile.close() if args.since: @@ -741,6 +778,8 @@ def main(): help='Display only the NFS statistics') group.add_argument('-r', '--rpc', action='store_true', dest='rpc_only', help='Display only the RPC statistics') + group.add_argument('-R', '--raw', action='store_true', + help='Display only the raw statistics') mountstats_parser.add_argument('mountpoints', nargs='*', metavar='mountpoint', help='Display statistics for this mountpoint. More than one may be specified.' 'If absent, statistics for all NFS mountpoints will be generated.')