From patchwork Fri Dec 2 13:30:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Austin S. Hemmelgarn" X-Patchwork-Id: 9458383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A285360515 for ; Fri, 2 Dec 2016 13:30:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92847284AA for ; Fri, 2 Dec 2016 13:30:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8552E28552; Fri, 2 Dec 2016 13:30:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3405A284AA for ; Fri, 2 Dec 2016 13:30:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760289AbcLBNa3 (ORCPT ); Fri, 2 Dec 2016 08:30:29 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:34140 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187AbcLBNa2 (ORCPT ); Fri, 2 Dec 2016 08:30:28 -0500 Received: by mail-io0-f194.google.com with SMTP id r94so7738600ioe.1 for ; Fri, 02 Dec 2016 05:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=AZto6s9NkflbYeCv7s9jU3oZqKV7MamM/ASNH9+6KOU=; b=HBxnMkigpbQ+ndACBynis9A1Rk7YAP07vQmBMkbFWL+XjSd/AgzKba5/5jeKb5mghB aVEpgUICB5O0/uYpacXAt2LItNrmg20XA0ROyBD/4/cGCTcAp9TMwOIqt4dnpkbpqvhw B9p9eH+bZ+FCkJWYwPYPrfMFlyjlgvk6F0ITStEN1tsJBu0iQSYqqhcwvcRx/YQLA+Z1 tT9i8S5ZbEmKoIw+IDvKj8T3R03mJT8KoMQskA3GtqC48wAPKEST9TfReRQtWevajHGF p/LguUc0t/zIDD3jcS8JSsm6J9UHkD81BWogqK9h7hpMo12Rvk9EbTbqAAgTd8XQ7WvO mZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AZto6s9NkflbYeCv7s9jU3oZqKV7MamM/ASNH9+6KOU=; b=aevUuNips42Yxz4V/ZvlYvGna5b0r1VKhMBat5ObkEtgdauXzMSvP9iAz6SmMDWRyS eTyKySnzKJ7aPy75UPweNOHIbdkTBJ/bJo2fN57/oWwLS0A2LJo+a517PDajrBZrIahv atgI/3aDlpiylY25C0qU8B4R+QfPWJDz+rqB82YVdJBH5l14Uzh/vL596NiqGZDm2aL8 4/aoPCNUSuGsDBvIo2IZ104c17S91xfg3bE7NaJ8+fNK5WjbDgYQUMz8GJPztqKfg1wM pX745U4uZQOrz7mCBG0KO2xXAQcpzKMzTaa1rHtcIIczXSoPs+POdJEwFxPqDIkXhNWg 6kiQ== X-Gm-Message-State: AKaTC006+O1O41/X6Lgmy9jwFMScsCSKizBmRheGl2BTGQJW8PMIdHb4A4bTMnYwjr0yow== X-Received: by 10.36.181.88 with SMTP id j24mr2475278iti.34.1480685427689; Fri, 02 Dec 2016 05:30:27 -0800 (PST) Received: from wild-karde.localdomain (rrcs-70-62-41-24.central.biz.rr.com. [70.62.41.24]) by smtp.googlemail.com with ESMTPSA id t20sm1073910ita.7.2016.12.02.05.30.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2016 05:30:26 -0800 (PST) Received: by wild-karde.localdomain (Postfix, from userid 1000) id 4F0F01E17734; Fri, 2 Dec 2016 08:30:25 -0500 (EST) From: "Austin S. Hemmelgarn" To: dsterba@suse.cz, linux-btrfs@vger.kernel.org Cc: "Austin S. Hemmelgarn" Subject: [PATCH v2] btrfs-progs: add dev stats returncode option Date: Fri, 2 Dec 2016 08:30:08 -0500 Message-Id: <20161202133008.72232-1-ahferroin7@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, `btrfs device stats` returns non-zero only when there was an error getting the counter values. This is fine for when it gets run by a user directly, but is a serious pain when trying to use it in a script or for monitoring since you need to parse the (not at all machine friendly) output to check the counter values. This patch adds an option ('-s') which causes `btrfs device stats` to set bit 6 in the return code if any of the counters are non-zero. This greatly simplifies checking from a script or monitoring software if any errors have been recorded. In the event that this switch is passed and an error occurs reading the stats, the return code will have bit 0 set (so if there are errors reading counters, and the counters which were read were non-zero, the return value will be 65). Signed-off-by: Austin S. Hemmelgarn --- Changes since v1: * Switched to using bit 6 instead of bit 7 so we don't stomp on Bash's manipulation of return codes. Thanks to Mike Fleetwood for reminding me about this. Documentation/btrfs-device.asciidoc | 8 +++++++- cmds-device.c | 39 ++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/Documentation/btrfs-device.asciidoc b/Documentation/btrfs-device.asciidoc index 239c99b..d398b6d 100644 --- a/Documentation/btrfs-device.asciidoc +++ b/Documentation/btrfs-device.asciidoc @@ -98,7 +98,7 @@ remain as such. Reloading the kernel module will drop this information. There's an alternative way of mounting multiple-device filesystem without the need for prior scanning. See the mount option 'device'. -*stats* [-z] |:: +*stats* [-zs] |:: Read and print the device IO error statistics for all devices of the given filesystem identified by or for a single . See section *DEVICE STATS* for more information. @@ -108,6 +108,9 @@ STATS* for more information. -z:::: Print the stats and reset the values to zero afterwards. +-s:::: +Set bit 6 of the return-code if any error statistics are non-zero. + *usage* [options] [...]:: Show detailed information about internal allocations in devices. + @@ -231,6 +234,9 @@ EXIT STATUS *btrfs device* returns a zero exit status if it succeeds. Non zero is returned in case of failure. +If the '-s' option is used, *btrfs device stats* will add 64 to the +exit status if any of the error counters is non-zero. + AVAILABILITY ------------ *btrfs* is part of btrfs-progs. diff --git a/cmds-device.c b/cmds-device.c index fa0830f..392e37c 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -376,6 +376,7 @@ static const char * const cmd_device_stats_usage[] = { "Show current device IO stats.", "", "-z show current stats and reset values to zero", + "-s return non-zero if any stat counter is not zero", NULL }; @@ -389,14 +390,18 @@ static int cmd_device_stats(int argc, char **argv) int i; int c; int err = 0; + int status = 0; __u64 flags = 0; DIR *dirstream = NULL; - while ((c = getopt(argc, argv, "z")) != -1) { + while ((c = getopt(argc, argv, "zs")) != -1) { switch (c) { case 'z': flags = BTRFS_DEV_STATS_RESET; break; + case 's': + status = 1; + break; case '?': default: usage(cmd_device_stats_usage); @@ -440,7 +445,7 @@ static int cmd_device_stats(int argc, char **argv) if (ioctl(fdmnt, BTRFS_IOC_GET_DEV_STATS, &args) < 0) { error("DEV_STATS ioctl failed on %s: %s", path, strerror(errno)); - err = 1; + err |= 1; } else { char *canonical_path; @@ -457,31 +462,51 @@ static int cmd_device_stats(int argc, char **argv) "devid:%llu", args.devid); } - if (args.nr_items >= BTRFS_DEV_STAT_WRITE_ERRS + 1) + if (args.nr_items >= BTRFS_DEV_STAT_WRITE_ERRS + 1) { printf("[%s].write_io_errs %llu\n", canonical_path, (unsigned long long) args.values[ BTRFS_DEV_STAT_WRITE_ERRS]); - if (args.nr_items >= BTRFS_DEV_STAT_READ_ERRS + 1) + if ((status == 1) && (args.values[BTRFS_DEV_STAT_WRITE_ERRS] > 0)) { + err |= 64; + } + } + if (args.nr_items >= BTRFS_DEV_STAT_READ_ERRS + 1) { printf("[%s].read_io_errs %llu\n", canonical_path, (unsigned long long) args.values[ BTRFS_DEV_STAT_READ_ERRS]); - if (args.nr_items >= BTRFS_DEV_STAT_FLUSH_ERRS + 1) + if ((status == 1) && (args.values[BTRFS_DEV_STAT_READ_ERRS] > 0)) { + err |= 64; + } + } + if (args.nr_items >= BTRFS_DEV_STAT_FLUSH_ERRS + 1) { printf("[%s].flush_io_errs %llu\n", canonical_path, (unsigned long long) args.values[ BTRFS_DEV_STAT_FLUSH_ERRS]); - if (args.nr_items >= BTRFS_DEV_STAT_CORRUPTION_ERRS + 1) + if ((status == 1) && (args.values[BTRFS_DEV_STAT_FLUSH_ERRS] > 0)) { + err |= 64; + } + } + if (args.nr_items >= BTRFS_DEV_STAT_CORRUPTION_ERRS + 1) { printf("[%s].corruption_errs %llu\n", canonical_path, (unsigned long long) args.values[ BTRFS_DEV_STAT_CORRUPTION_ERRS]); - if (args.nr_items >= BTRFS_DEV_STAT_GENERATION_ERRS + 1) + if ((status == 1) && (args.values[BTRFS_DEV_STAT_CORRUPTION_ERRS] > 0)) { + err |= 64; + } + } + if (args.nr_items >= BTRFS_DEV_STAT_GENERATION_ERRS + 1) { printf("[%s].generation_errs %llu\n", canonical_path, (unsigned long long) args.values[ BTRFS_DEV_STAT_GENERATION_ERRS]); + if ((status == 1) && (args.values[BTRFS_DEV_STAT_GENERATION_ERRS] > 0)) { + err |= 64; + } + } free(canonical_path); }