From patchwork Fri Feb 14 18:40:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Maggard X-Patchwork-Id: 3653401 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DF7639F1EE for ; Fri, 14 Feb 2014 18:41:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E008C2018B for ; Fri, 14 Feb 2014 18:41:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF94A20149 for ; Fri, 14 Feb 2014 18:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751965AbaBNSlQ (ORCPT ); Fri, 14 Feb 2014 13:41:16 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:34111 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751927AbaBNSlO (ORCPT ); Fri, 14 Feb 2014 13:41:14 -0500 Received: by mail-pd0-f170.google.com with SMTP id p10so12303272pdj.29 for ; Fri, 14 Feb 2014 10:41:14 -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=XCVySTVxlAFcX/e2KvfjGal89EYkyr9TV5wxGCBplOY=; b=lZoxBFqolRtxfzk6lcn0KMuOcldXsA1+3PkOTOkmAEPUb4lxu2m/Eqh85AF3RqMT0S CGKTH7OqT1lODeh8rzzxLmKcsgS/zhS+u105qzUxrpF8OygHWJXzG0/GaGpvDjWIkk5E VdNCJGXEQQ0pDOLxsAtUTIPxHmafsU/EnBaU7F2JvCypl2f8fBo65hvUXyqfRiiER8iA 55MCOfiGOx/KpnqY+fC5X8tW5dokuHfCFXgy2oIbc+wnmHfdAs30GrumKDSIy/ozFfE4 ZdclXafLVoLL9nenAlZI6uV+ld1Xz3MDAM8uY+oHMixQbyW2UAnx1gV5TiezeXQgjRd9 jTIw== X-Received: by 10.68.221.42 with SMTP id qb10mr10758146pbc.65.1392403274148; Fri, 14 Feb 2014 10:41:14 -0800 (PST) Received: from jmaggard-ThinkPad-W520.infrant-6.com ([209.249.181.1]) by mx.google.com with ESMTPSA id db3sm19620315pbb.10.2014.02.14.10.41.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Feb 2014 10:41:13 -0800 (PST) From: Justin Maggard To: linux-btrfs@vger.kernel.org Cc: Justin Maggard Subject: [PATCH v2] btrfs-progs: add dry-run option to restore command Date: Fri, 14 Feb 2014 10:40:47 -0800 Message-Id: <1392403247-3627-1-git-send-email-jmaggard10@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Sometimes it is useful to see what btrfs restore is going to do before provisioning enough external storage to restore onto. Add a dry-run option so we can see what files and paths are found by restore, without actually restoring any data. Signed-off-by: Justin Maggard --- cmds-restore.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cmds-restore.c b/cmds-restore.c index 1748262..26792a8 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -53,6 +53,7 @@ static int verbose = 0; static int ignore_errors = 0; static int overwrite = 0; static int get_xattrs = 0; +static int dry_run = 0; #define LZO_LEN 4 #define PAGE_CACHE_SIZE 4096 @@ -801,6 +802,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, } if (verbose) printf("Restoring %s\n", path_name); + if (dry_run) + goto next; fd = open(path_name, O_CREAT|O_WRONLY, 0644); if (fd < 0) { fprintf(stderr, "Error creating %s: %d\n", @@ -873,7 +876,10 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, printf("Restoring %s\n", path_name); errno = 0; - ret = mkdir(path_name, 0755); + if (dry_run) + ret = 0; + else + ret = mkdir(path_name, 0755); if (ret && errno != EEXIST) { free(dir); fprintf(stderr, "Error mkdiring %s: %d\n", @@ -1090,6 +1096,7 @@ out: static struct option long_options[] = { { "path-regex", 1, NULL, 256}, + { "dry-run", 0, NULL, 'D'}, { NULL, 0, NULL, 0} }; @@ -1105,9 +1112,10 @@ const char * const cmd_restore_usage[] = { "-t tree location", "-f filesystem location", "-u super mirror", - "-r root objectid", + "-r root objectid", "-d find dir", "-l list tree roots", + "-D|--dry-run dry run (only list files that would be recovered)", "--path-regex ", " restore only filenames matching regex,", " you have to use following syntax (possibly quoted):", @@ -1135,7 +1143,7 @@ int cmd_restore(int argc, char **argv) regex_t match_reg, *mreg = NULL; char reg_err[256]; - while ((opt = getopt_long(argc, argv, "sxviot:u:df:r:lc", long_options, + while ((opt = getopt_long(argc, argv, "sxviot:u:df:r:lDc", long_options, &option_index)) != -1) { switch (opt) { @@ -1191,6 +1199,9 @@ int cmd_restore(int argc, char **argv) case 'l': list_roots = 1; break; + case 'D': + dry_run = 1; + break; case 'c': match_cflags |= REG_ICASE; break;