From patchwork Thu Dec 1 18:43:05 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: 9456685 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 418CF60585 for ; Thu, 1 Dec 2016 18:43:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 384D628522 for ; Thu, 1 Dec 2016 18:43:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D1742852F; Thu, 1 Dec 2016 18:43:37 +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 A547E28522 for ; Thu, 1 Dec 2016 18:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758835AbcLASne (ORCPT ); Thu, 1 Dec 2016 13:43:34 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:33634 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757144AbcLASnd (ORCPT ); Thu, 1 Dec 2016 13:43:33 -0500 Received: by mail-io0-f195.google.com with SMTP id j92so2717868ioi.0 for ; Thu, 01 Dec 2016 10:43:33 -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=QUv3pasCyigNafRClnxCJ+VG7sDUcqaJkd3g9wZcRrM=; b=hKO/E7jXW3hQHV0uHx+jbhPchZv3LNBGFwLM+9rnubUZSEAhEPP+Oxp2FAuIX3r5wF 0/ti8GWAW8+MgyQST0u02o0aWxk+Q8jsrehvesNjrVJ5k66n5MQlW9ehcT0qdEDDmrzX lbC4o/rXfP+O1zVRjWWHjl5DmhHab6RjkFKbjb57l17BN5flrtoOK/z/sii2edNxOzK5 LmdT90VSi0Dcg7GE7GziwXdNi9pSsPvGvpqrAIckHYyoln1618mUWZ5wpkxA1vm/2DCf l8itpFuZyzNYEIvzgPJ9BfMPATU7PIybljsADeHXDuzfkLqwihsOjeD6Xg3n/5Fis+yc 1Tkg== 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=QUv3pasCyigNafRClnxCJ+VG7sDUcqaJkd3g9wZcRrM=; b=NVTc4Rh1mbhPLtgeNQ4SUVa2exYF94vJzdUIEC0SI34aOK5ctIWfBb7Fy4SlInO/Fb GgaPewao3l6VXsbyxGfj3bAbwnhxYNCXEGqdkzZ37LJ7W+zl8Nn0oJWZENw+R7TPiUEU g8LqLDT817tB52UUJmtTh3P+efBbB8j62XHvUxZzSxIihcn9jhvgFEE7z8Kk/9oMCVV9 ajQq8RLXz6FimHoCCZ79PgFo3hmrgCJLT+RTij0ZcuFS5rYNSFPcbuMmGmQcIuNs4J+7 7If5cjeqf1FtIugVK+gawDqc7qeOtq0RjBKXXNe/uoRcmLECeb8J6tg/MItkkEU4xTOI wHSg== X-Gm-Message-State: AKaTC01zhpkoMrrzJL5QVkSVEgT1ll239T4MCKBaJ+PX9UC6jWFaMmdtstiiWYcXP0O32w== X-Received: by 10.107.176.85 with SMTP id z82mr32215865ioe.133.1480617812310; Thu, 01 Dec 2016 10:43:32 -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 d186sm672247itc.7.2016.12.01.10.43.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 10:43:31 -0800 (PST) Received: by wild-karde.localdomain (Postfix, from userid 1000) id EF4631E166CA; Thu, 1 Dec 2016 13:43:28 -0500 (EST) From: "Austin S. Hemmelgarn" To: dsterba@suse.cz, linux-btrfs@vger.kernel.org Cc: "Austin S. Hemmelgarn" Subject: [PATCH] btrfs-progs: add dev stats returncode option Date: Thu, 1 Dec 2016 13:43:05 -0500 Message-Id: <20161201184305.3415-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 7 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 129). Signed-off-by: Austin S. Hemmelgarn --- Tested on multiple filesystems with various values of error counters (all manually set with a hex-editor) Both the flag letter and the bit being set were picked rather arbitrarily (-s intended to be short for status, bit 7 just seemed reasonable). I have no issue changing either, but would prefer to avoid bikeshedding about stuff like this since this helps out with an area where BTRFS is severely lacking right now (monitoring). 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..97a2ed6 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 the high bit 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 128 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..3fa3018 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 |= 128; + } + } + 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 |= 128; + } + } + 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 |= 128; + } + } + 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 |= 128; + } + } + 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 |= 128; + } + } free(canonical_path); }