소스 검색

ignore posix_fadvise errors in repository.py, work around #2095

note: we also ignore the call's return value in _chunker.c.

both is harmless as the call not working does not cause incorrect function,
just worse performance due to constant flooding of the cache (as if we
would not issue the call).
Thomas Waldmann 8 년 전
부모
커밋
add38e8cde
1개의 변경된 파일13개의 추가작업 그리고 3개의 파일을 삭제
  1. 13 3
      borg/repository.py

+ 13 - 3
borg/repository.py

@@ -833,9 +833,19 @@ class LoggedIO:
                 fileno = fd.fileno()
                 os.fsync(fileno)
                 if hasattr(os, 'posix_fadvise'):  # only on UNIX
-                    # tell the OS that it does not need to cache what we just wrote,
-                    # avoids spoiling the cache for the OS and other processes.
-                    os.posix_fadvise(fileno, 0, 0, os.POSIX_FADV_DONTNEED)
+                    try:
+                        # tell the OS that it does not need to cache what we just wrote,
+                        # avoids spoiling the cache for the OS and other processes.
+                        os.posix_fadvise(fileno, 0, 0, os.POSIX_FADV_DONTNEED)
+                    except OSError:
+                        # usually, posix_fadvise can't fail for us, but there seem to
+                        # be failures when running borg under docker on ARM, likely due
+                        # to a bug outside of borg.
+                        # also, there is a python wrapper bug, always giving errno = 0.
+                        # https://github.com/borgbackup/borg/issues/2095
+                        # as this call is not critical for correct function (just to
+                        # optimize cache usage), we ignore these errors.
+                        pass
             finally:
                 fd.close()
                 if dirname: