From 841e6306e31b544998266fb9b5dd70630a79cc0d Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Thu, 15 Oct 2015 19:34:58 +0200 Subject: [PATCH] Avoid the duplicated 'Missing file' message When fixing with filters, the filtered out files were reported multiple times as missing. We now mark if a file is missing, and we avoid to try to open it multiple times. --- cmdline/check.c | 14 +++++++++++--- cmdline/elem.h | 7 +++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cmdline/check.c b/cmdline/check.c index 950dc881..6a105dce 100644 --- a/cmdline/check.c +++ b/cmdline/check.c @@ -1033,9 +1033,12 @@ static int state_check_process(struct snapraid_state* state, int fix, struct sna file_flag_set(file, FILE_IS_CREATED); } } else { - /* otherwise, open the file only for reading */ - ret = handle_open(&handle[j], file, state->file_mode, - log_error, state->opt.expected_missing ? log_expected : 0); + /* open the file only for reading */ + if (!file_flag_has(file, FILE_IS_MISSING)) + ret = handle_open(&handle[j], file, state->file_mode, + log_error, state->opt.expected_missing ? log_expected : 0); + else + ret = -1; /* if the file is missing, we cannot open it */ if (ret == -1) { /* save the failed block for the check/fix */ failed[failed_count].is_bad = 1; @@ -1050,6 +1053,11 @@ static int state_check_process(struct snapraid_state* state, int fix, struct sna log_tag("error:%u:%s:%s: Open error at position %u\n", i, disk->name, esc(file->sub), file_pos); ++error; + + /* mark the file as missing, to avoid to retry to open it again */ + /* note that this can be done only if we are not fixing it */ + /* otherwise, it could be recreated */ + file_flag_set(file, FILE_IS_MISSING); continue; } } diff --git a/cmdline/elem.h b/cmdline/elem.h index 79672659..f85ea18b 100644 --- a/cmdline/elem.h +++ b/cmdline/elem.h @@ -239,6 +239,13 @@ struct snapraid_block { */ #define FILE_IS_DELETED 0x400 +/** + * The file is missing. + * This happens in fix/check when a file is cannot be opened, + * and marking it as such prevents to retry to open it again. + */ +#define FILE_IS_MISSING 0x800 + #define FILE_IS_HARDLINK 0x1000 /**< If it's an hardlink. */ #define FILE_IS_SYMLINK 0x2000 /**< If it's a file symlink. */ #define FILE_IS_SYMDIR 0x4000 /**< If it's a dir symlink for Windows. Not yet supported. */