upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-01 15:15:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #4297 from ThomasWaldmann/fix-free-space-calc-1.1

Browse source 
Use f_frsize instead of f_bsize to calculate free space. Fixes #4289
This commit is contained in:
TW 2019-02-01 14:21:25 +01:00 committed by GitHub
commit 0fca021127
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/remote.py
View file

@ -1108,7 +1108,7 @@ class RepositoryCache(RepositoryNoCache):
def query_size_limit(self):
stat_fs = os.statvfs(self.basedir)
available_space = stat_fs.f_bsize * stat_fs.f_bavail
available_space = stat_fs.f_bavail * stat_fs.f_frsize
self.size_limit = int(min(available_space * 0.25, 2**31))
def key_filename(self, key):

2
src/borg/repository.py
View file

@ -644,7 +644,7 @@ class Repository:
logger.warning('Failed to check free space before committing: ' + str(os_error))
return
# f_bavail: even as root - don't touch the Federal Block Reserve!
free_space = st_vfs.f_bavail * st_vfs.f_bsize
free_space = st_vfs.f_bavail * st_vfs.f_frsize
logger.debug('check_free_space: required bytes {}, free bytes {}'.format(required_free_space, free_space))
if free_space < required_free_space:
if self.created: