From patchwork Thu Feb 28 06:54:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 10832585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4239A139A for ; Thu, 28 Feb 2019 06:54:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 306AB2DB43 for ; Thu, 28 Feb 2019 06:54:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 201772DB4E; Thu, 28 Feb 2019 06:54:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 7F66E2DB43 for ; Thu, 28 Feb 2019 06:54:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730965AbfB1Gy0 (ORCPT ); Thu, 28 Feb 2019 01:54:26 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:48792 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725967AbfB1Gy0 (ORCPT ); Thu, 28 Feb 2019 01:54:26 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1S6sF5E119381 for ; Thu, 28 Feb 2019 06:54:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id; s=corp-2018-07-02; bh=uH7cS0M9+EXm60DjLtFCZTo8mUWlpim6FlFLKCJH7wU=; b=HFta5L0sKlZqA0rw1oHUVxO2uudauCotS54RYJlwk6sV4MIwDGU9J757gvhtt2vWxoO5 8aow28oXfcI8TWm33aT8WKTPZhOMXRxKtoemFeM9I/5KOryGlKBkck1NK8MI6JAIANjJ QzWOAjB1jnzEM+Ywc49Z/AfQ1zHisnlyQv3WajyqrhXLP+xc8knoY69Oqeljbtpr60FJ 2qypMEjC6CBLi9eJndjiE1HfAynnf29HBdEbcpHm60cjXmUavwPSfPOAkTi/tYq7pR9V DM6PaDesTENhljjWABJenSKLKejnzgXz7mFz2UgImHWYjl1vjsdeouO6dmM/Z2XCh2tI jA== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2qtxtry1y4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 28 Feb 2019 06:54:24 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x1S6sOK4000332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 28 Feb 2019 06:54:24 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x1S6sO9p017668 for ; Thu, 28 Feb 2019 06:54:24 GMT Received: from tpasj.wifi.oracle.com (/192.188.170.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 27 Feb 2019 22:54:23 -0800 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH v4] btrfs-progs: dump-tree: add noscan option Date: Thu, 28 Feb 2019 14:54:25 +0800 Message-Id: <1551336865-9954-1-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9180 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902280048 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 From: Anand Jain There is no way to dump tree from a disk in the degraded mode. Such as, when you specify a device for the cli 'btrfs inspect dump-tree /dev/sda' it would invariably scan for its partner devices to built and print the tree. This approach at times defeats the purpose. Suppose in RAID1 if you want to review each mirror separately as of now there is no way you can do that. So this patch adds an option --noscan for example: 'btrfs inspect dump-tree --noscan [..]' with which it shall not scan for the other devices to report the tree, and helps debug RAID1s. Signed-off-by: Anand Jain v3->v4: change the patch title. collapse scan_args() to its only parent cmd_inspect_dump_tree() (it was bit confusing). update the change log. update usage. update man page. v2->v3: make it scalable for more than two disks in noscan mode v1->v2: rename --degraded to --noscan --- Documentation/btrfs-inspect-internal.asciidoc | 5 ++- cmds-inspect-dump-tree.c | 57 ++++++++++++++++++++------- 2 files changed, 47 insertions(+), 15 deletions(-) diff --git a/Documentation/btrfs-inspect-internal.asciidoc b/Documentation/btrfs-inspect-internal.asciidoc index 381497d284b8..f9d7f1c58f00 100644 --- a/Documentation/btrfs-inspect-internal.asciidoc +++ b/Documentation/btrfs-inspect-internal.asciidoc @@ -61,7 +61,7 @@ specify which mirror to print, valid values are 0, 1 and 2 and the superblock must be present on the device with a valid signature, can be used together with '--force' -*dump-tree* [options] :: +*dump-tree* [options] [device...]:: (replaces the standalone tool *btrfs-debug-tree*) + Dump tree structures from a given device in textual form, expand keys to human @@ -95,6 +95,9 @@ intermixed in the output --bfs:::: use breadth-first search to print trees. the nodes are printed before all leaves +--noscan:::: +do not scan the system for other partner device(s), only use the device(s) +provided in the argument -t :::: print only the tree with the specified ID, where the ID can be numerical or common name in a flexible human readable form diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c index ad5345b4f1db..9dd040e5de17 100644 --- a/cmds-inspect-dump-tree.c +++ b/cmds-inspect-dump-tree.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "kerncompat.h" #include "radix-tree.h" @@ -185,7 +186,7 @@ static u64 treeid_from_string(const char *str, const char **end) } const char * const cmd_inspect_dump_tree_usage[] = { - "btrfs inspect-internal dump-tree [options] device", + "btrfs inspect-internal dump-tree [options] [ ..]", "Dump tree structures from a given device", "Dump tree structures from a given device in textual form, expand keys to human", "readable equivalents where possible.", @@ -200,6 +201,7 @@ const char * const cmd_inspect_dump_tree_usage[] = { "-b|--block print info from the specified block only", "-t|--tree print only tree with the given id (string or number)", "--follow use with -b, to show all children tree blocks of ", + "--noscan do not scan for the partner device(s)", NULL }; @@ -214,7 +216,7 @@ int cmd_inspect_dump_tree(int argc, char **argv) struct btrfs_disk_key disk_key; struct btrfs_key found_key; char uuidbuf[BTRFS_UUID_UNPARSED_SIZE]; - int ret; + int ret = 0; int slot; int extent_only = 0; int device_only = 0; @@ -222,6 +224,7 @@ int cmd_inspect_dump_tree(int argc, char **argv) int roots_only = 0; int root_backups = 0; int traverse = BTRFS_PRINT_TREE_DEFAULT; + int dev_optind; unsigned open_ctree_flags; u64 block_only = 0; struct btrfs_root *tree_root_scan; @@ -239,8 +242,8 @@ int cmd_inspect_dump_tree(int argc, char **argv) optind = 0; while (1) { int c; - enum { GETOPT_VAL_FOLLOW = 256, GETOPT_VAL_DFS, - GETOPT_VAL_BFS }; + enum { GETOPT_VAL_FOLLOW = 256, GETOPT_VAL_DFS, GETOPT_VAL_BFS, + GETOPT_VAL_NOSCAN}; static const struct option long_options[] = { { "extents", no_argument, NULL, 'e'}, { "device", no_argument, NULL, 'd'}, @@ -252,6 +255,7 @@ int cmd_inspect_dump_tree(int argc, char **argv) { "follow", no_argument, NULL, GETOPT_VAL_FOLLOW }, { "bfs", no_argument, NULL, GETOPT_VAL_BFS }, { "dfs", no_argument, NULL, GETOPT_VAL_DFS }, + { "noscan", no_argument, NULL, GETOPT_VAL_NOSCAN }, { NULL, 0, NULL, 0 } }; @@ -313,24 +317,49 @@ int cmd_inspect_dump_tree(int argc, char **argv) case GETOPT_VAL_BFS: traverse = BTRFS_PRINT_TREE_BFS; break; + case GETOPT_VAL_NOSCAN: + open_ctree_flags |= OPEN_CTREE_NO_DEVICES; + break; default: usage(cmd_inspect_dump_tree_usage); } } - if (check_argc_exact(argc - optind, 1)) + if (check_argc_min(argc - optind, 1)) usage(cmd_inspect_dump_tree_usage); - ret = check_arg_type(argv[optind]); - if (ret != BTRFS_ARG_BLKDEV && ret != BTRFS_ARG_REG) { - if (ret < 0) { - errno = -ret; - error("invalid argument %s: %m", argv[optind]); - } else { - error("not a block device or regular file: %s", - argv[optind]); + dev_optind = optind; + while (dev_optind < argc) { + int fd; + struct btrfs_fs_devices *fs_devices; + u64 num_devices; + + ret = check_arg_type(argv[optind]); + if (ret != BTRFS_ARG_BLKDEV && ret != BTRFS_ARG_REG) { + if (ret < 0) { + errno = -ret; + error("invalid argument %s: %m", argv[dev_optind]); + } else { + error("not a block device or regular file: %s", + argv[dev_optind]); + } } - goto out; + fd = open(argv[dev_optind], O_RDONLY); + if (fd < 0) { + error("cannot open %s: %m", argv[dev_optind]); + return -EINVAL; + } + ret = btrfs_scan_one_device(fd, argv[dev_optind], &fs_devices, + &num_devices, + BTRFS_SUPER_INFO_OFFSET, + SBREAD_DEFAULT); + close(fd); + if (ret) { + error("device scan %s: %s", argv[dev_optind], + strerror(-ret)); + return ret; + } + dev_optind++; } printf("%s\n", PACKAGE_STRING);