rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-25 18:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make search candidate I/O failures nonfatal during recovery

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-09-25 08:12:36 +02:00
parent 3c155e925d
commit 190efbefb2
1 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
cmdline/search.c
View file

@ -67,15 +67,11 @@ int search_file_compare(const void* void_arg, const void* void_data)
/* read the block and compare the hash */
f = open(path, O_RDONLY | O_BINARY);
if (f == -1) {
/* LCOV_EXCL_START */
if (errno == ENOENT) {
log_fatal(EUSER, "DANGER! file '%s' disappeared.\n", path);
log_fatal(EUSER, "If you moved it, please rerun the same command.\n");
} else {
log_fatal(errno, "Error opening file '%s'. %s.\n", path, strerror(errno));
}
exit(EXIT_FAILURE);
/* LCOV_EXCL_STOP */
if (errno == ENOENT)
log_error(EUSER, "WARNING! Search candidate file '%s' disappeared.\n", path);
else
log_error(errno, "WARNING! Error opening search candidate '%s'. %s.\n", path, strerror(errno));
return -1;
}
count = 0;
@ -85,17 +81,16 @@ int search_file_compare(const void* void_arg, const void* void_data)
if (errno == EINTR)
continue;
/* LCOV_EXCL_START */
log_fatal(errno, "Error reading file '%s'. %s.\n", path, strerror(errno));
exit(EXIT_FAILURE);
/* LCOV_EXCL_STOP */
log_error(errno, "WARNING! Error reading search candidate '%s'. %s.\n", path, strerror(errno));
if (close(f) != 0)
log_error(errno, "WARNING! Error closing search candidate '%s'. %s.\n", path, strerror(errno));
return -1;
}
if (ret == 0) {
/* LCOV_EXCL_START */
errno = ENXIO;
log_fatal(errno, "Unexpected end of file '%s'. %s.\n", path, strerror(errno));
exit(EXIT_FAILURE);
/* LCOV_EXCL_STOP */
log_error(EUSER, "WARNING! Unexpected end of file in search candidate '%s'.\n", path);
if (close(f) != 0)
log_error(errno, "WARNING! Error closing search candidate '%s'. %s.\n", path, strerror(errno));
return -1;
}
count += ret;
@ -103,10 +98,8 @@ int search_file_compare(const void* void_arg, const void* void_data)
ret = close(f);
if (ret != 0) {
/* LCOV_EXCL_START */
log_fatal(errno, "Error closing file '%s'. %s.\n", path, strerror(errno));
exit(EXIT_FAILURE);
/* LCOV_EXCL_STOP */
log_error(errno, "WARNING! Error closing search candidate '%s'. %s.\n", path, strerror(errno));
return -1;
}
if (arg->read_size != state->block_size) {