|
 |
cb5609 |
From 33be80700bc594f34818ce697493c17e70430390 Mon Sep 17 00:00:00 2001
|
|
|
cb5609 |
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
|
|
cb5609 |
Date: Mon, 17 May 2021 08:50:25 +0200
|
|
|
cb5609 |
Subject: [PATCH] Recover from fsync fail on read-only filesystem
|
|
|
cb5609 |
(RhBug:1956361)
|
|
|
cb5609 |
|
|
|
cb5609 |
When `fsync` fails due to the file not supporting synchronization just log
|
|
|
cb5609 |
the problem instead of failing the whole dnf run. This happens for
|
|
|
cb5609 |
example with filesystems mounted read-only in which case there is no
|
|
|
cb5609 |
point to `fsync` anyway.
|
|
|
cb5609 |
|
|
|
cb5609 |
Currently we also ignore return values from `FSETXATTR` which also fails
|
|
|
cb5609 |
on read-only filesystem (so no checksum cache is set). This is fine however
|
|
|
cb5609 |
since the checksum is recomputed when needed, dnf is just a bit slower.
|
|
|
cb5609 |
|
|
|
cb5609 |
https://bugzilla.redhat.com/show_bug.cgi?id=1956361
|
|
|
cb5609 |
---
|
|
|
cb5609 |
librepo/checksum.c | 10 +++++++---
|
|
|
cb5609 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
cb5609 |
|
|
|
cb5609 |
diff --git a/librepo/checksum.c b/librepo/checksum.c
|
|
|
cb5609 |
index db37040..6bba53c 100644
|
|
|
cb5609 |
--- a/librepo/checksum.c
|
|
|
cb5609 |
+++ b/librepo/checksum.c
|
|
|
cb5609 |
@@ -266,9 +266,13 @@ lr_checksum_fd_compare(LrChecksumType type,
|
|
|
cb5609 |
*matches = (strcmp(expected, checksum)) ? FALSE : TRUE;
|
|
|
cb5609 |
|
|
|
cb5609 |
if (fsync(fd) != 0) {
|
|
|
cb5609 |
- g_set_error(err, LR_CHECKSUM_ERROR, LRE_FILE,
|
|
|
cb5609 |
- "fsync failed: %s", strerror(errno));
|
|
|
cb5609 |
- return FALSE;
|
|
|
cb5609 |
+ if (errno == EROFS || errno == EINVAL) {
|
|
|
cb5609 |
+ g_debug("fsync failed: %s", strerror(errno));
|
|
|
cb5609 |
+ } else {
|
|
|
cb5609 |
+ g_set_error(err, LR_CHECKSUM_ERROR, LRE_FILE,
|
|
|
cb5609 |
+ "fsync failed: %s", strerror(errno));
|
|
|
cb5609 |
+ return FALSE;
|
|
|
cb5609 |
+ }
|
|
|
cb5609 |
}
|
|
|
cb5609 |
|
|
|
cb5609 |
if (caching && *matches && timestamp != -1) {
|
|
|
cb5609 |
--
|
|
|
cb5609 |
2.31.1
|
|
|
cb5609 |
|