From patchwork Fri Dec 12 19:14:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 5485071 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 0A07EBEEBA for ; Fri, 12 Dec 2014 19:15:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 26DC82014A for ; Fri, 12 Dec 2014 19:15:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31CC5201B4 for ; Fri, 12 Dec 2014 19:15:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966256AbaLLTPO (ORCPT ); Fri, 12 Dec 2014 14:15:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47690 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965676AbaLLTPD (ORCPT ); Fri, 12 Dec 2014 14:15:03 -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 sBCJF2x4016235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 12 Dec 2014 14:15:03 -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 sBCJF137010146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 12 Dec 2014 14:15:02 -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 sBCJF19v000449 for ; Fri, 12 Dec 2014 14:15:01 -0500 Received: (from smayhew@localhost) by tonberry.usersys.redhat.com (8.14.8/8.14.8/Submit) id sBCJF1B1000424 for linux-nfs@vger.kernel.org; Fri, 12 Dec 2014 14:15:01 -0500 From: Scott Mayhew To: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH v4 11/14] mountstats: Allow mountstats_command to take a variable number of mountpoints Date: Fri, 12 Dec 2014 14:14:54 -0500 Message-Id: <1418411697-65535-12-git-send-email-smayhew@redhat.com> In-Reply-To: <1418411697-65535-1-git-send-email-smayhew@redhat.com> References: <1418411697-65535-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 Allow the mountstats command to take a variable number of mountpoints (including none, in which case it will print stats for all NFS mountpoints it finds). Signed-off-by: Scott Mayhew --- tools/mountstats/mountstats.py | 48 ++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py index 769c458..4a6dc44 100644 --- a/tools/mountstats/mountstats.py +++ b/tools/mountstats/mountstats.py @@ -311,11 +311,14 @@ class DeviceData: return True return False + def display_stats_header(self): + print('Stats for %s mounted on %s:' % \ + (self.__nfs_data['export'], self.__nfs_data['mountpoint'])) + def display_nfs_options(self): """Pretty-print the NFS options """ - print('Stats for %s mounted on %s:' % \ - (self.__nfs_data['export'], self.__nfs_data['mountpoint'])) + self.display_stats_header() print(' NFS mount options: %s' % ','.join(self.__nfs_data['mountoptions'])) print(' NFS server capabilities: %s' % ','.join(self.__nfs_data['servercapabilities'])) @@ -562,6 +565,7 @@ def print_mountstats(stats, nfs_only, rpc_only): stats.display_nfs_events() stats.display_nfs_bytes() elif rpc_only: + stats.display_stats_header() stats.display_rpc_generic_stats() stats.display_rpc_op_stats() else: @@ -569,27 +573,42 @@ def print_mountstats(stats, nfs_only, rpc_only): stats.display_nfs_bytes() stats.display_rpc_generic_stats() stats.display_rpc_op_stats() + print() def mountstats_command(args): """Mountstats command """ mountstats = parse_stats_file(args.infile) + mountpoints = args.mountpoints + + # make certain devices contains only NFS mount points + if len(mountpoints) > 0: + check = [] + for device in mountpoints: + stats = DeviceData() + try: + stats.parse_stats(mountstats[device]) + if stats.is_nfs_mountpoint(): + check += [device] + except KeyError: + continue + mountpoints = check + else: + for device, descr in mountstats.items(): + stats = DeviceData() + stats.parse_stats(descr) + if stats.is_nfs_mountpoint(): + mountpoints += [device] + if len(mountpoints) == 0: + print('No NFS mount points were found') + return if args.since: old_mountstats = parse_stats_file(args.since) - for mp in args.mountpoints: - if mp not in mountstats: - print('Statistics for mount point %s not found' % mp) - continue - + for mp in mountpoints: stats = DeviceData() stats.parse_stats(mountstats[mp]) - - if not stats.is_nfs_mountpoint(): - print('Mount point %s exists but is not an NFS mount' % mp) - continue - if not args.since: print_mountstats(stats, args.nfs_only, args.rpc_only) elif args.since and mp not in old_mountstats: @@ -736,8 +755,9 @@ def main(): help='Display only the RPC statistics') # The mountpoints argument cannot be moved into the common_parser because # it will screw up the parsing of the iostat arguments (interval and count) - mountstats_parser.add_argument('mountpoints', nargs='+', metavar='mountpoint', - help='Display statistics for this mountpoint. More than one may be specified.') + 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.') mountstats_parser.set_defaults(func=mountstats_command) nfsstat_parser = subparsers.add_parser('nfsstat',