mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Substract sparse extents before checking if file fits on storage

Browse Source 
(cherry picked from commit 6a73f2832d)
This commit is contained in:
Martin 2020-01-22 12:52:57 +01:00
parent 6cfc34f9f7
commit 0e01b34628
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
urbackupserver/server_hash.cpp
View File

@ -929,15 +929,32 @@ void BackupServerHash::addFile(int backupid, int incremental, IFile *tf, const s
if( fs>0 && available_space<=fs )
{
if(space_logcnt==0)
if (extent_iterator != NULL)
{
ServerLogger::Log(logid, "HT: No free space available deleting backups...", LL_WARNING);
extent_iterator->reset();
IFsFile::SSparseExtent ext;
while ((ext = extent_iterator->nextExtent()).offset!=-1)
{
if(ext.size>0)
fs -= ext.size;
}
extent_iterator->reset();
}
else
if (fs > 0 && available_space <= fs)
{
ServerLogger::Log(logid, "HT: No free space available deleting backups...", LL_WARNING);
if (space_logcnt == 0)
{
ServerLogger::Log(logid, "HT: No free space available deleting backups...", LL_WARNING);
}
else
{
ServerLogger::Log(logid, "HT: No free space available deleting backups...", LL_WARNING);
}
free_ok = freeSpace(fs, os_file_prefix(tfn));
}
free_ok=freeSpace(fs, os_file_prefix(tfn));
}
if(!free_ok)