haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4080 from drwtsn32x/improve-config-change-detection

Browse Source 
Consider file attributes and max file size exclusions in USN hash
This commit is contained in:
warwickmm
2020-02-02 21:29:44 -08:00
committed by GitHub
parent 6684610ee1 247a452d2b
commit 1dbaf360a6
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Main/Operation/BackupHandler.cs
+3 -1
View File
@@ -103,8 +103,10 @@ namespace Duplicati.Library.Main.Operation
private UsnJournalService GetJournalService(IEnumerable<string> sources, ISnapshotService snapshot, IFilter filter, long lastfilesetid)
{
if (m_options.UsnStrategy == Options.OptimizationStrategy.Off) return null;
var journalData = m_database.GetChangeJournalData(lastfilesetid);
var service = new UsnJournalService(sources, snapshot, filter, journalData, cancellationTokenSource.Token);
var service = new UsnJournalService(sources, snapshot, filter, m_options.FileAttributeFilter, m_options.SkipFilesLargerThan,
journalData, cancellationTokenSource.Token);
foreach (var volumeData in service.VolumeDataList)
{
Duplicati/Library/Snapshots/UsnJournalService.cs
+17 -6
View File
@@ -44,13 +44,16 @@ namespace Duplicati.Library.Snapshots
/// <param name="sources">Sources to filter</param>
/// <param name="snapshot"></param>
/// <param name="emitFilter">Emit filter</param>
/// <param name="fileAttributeFilter"></param>
/// <param name="skipFilesLargerThan"></param>
/// <param name="prevJournalData">Journal-data of previous fileset</param>
public UsnJournalService(IEnumerable<string> sources, ISnapshotService snapshot, IFilter emitFilter,
IEnumerable<USNJournalDataEntry> prevJournalData, CancellationToken token)
/// <param name="token"></param>
public UsnJournalService(IEnumerable<string> sources, ISnapshotService snapshot, IFilter emitFilter, FileAttributes fileAttributeFilter,
long skipFilesLargerThan, IEnumerable<USNJournalDataEntry> prevJournalData, CancellationToken token)
{
m_sources = sources;
m_snapshot = snapshot;
m_volumeDataDict = Initialize(emitFilter, prevJournalData);
m_volumeDataDict = Initialize(emitFilter, fileAttributeFilter, skipFilesLargerThan, prevJournalData);
m_token = token;
}
@@ -60,18 +63,26 @@ namespace Duplicati.Library.Snapshots
/// Initialize list of modified files / folder for each volume
/// </summary>
/// <param name="emitFilter"></param>
/// <param name="fileAttributeFilter"></param>
/// <param name="skipFilesLargerThan"></param>
/// <param name="prevJournalData"></param>
/// <returns></returns>
private Dictionary<string, VolumeData> Initialize(IFilter emitFilter, IEnumerable<USNJournalDataEntry> prevJournalData)
private Dictionary<string, VolumeData> Initialize(IFilter emitFilter, FileAttributes fileAttributeFilter, long skipFilesLargerThan,
IEnumerable<USNJournalDataEntry> prevJournalData)
{
if (prevJournalData == null)
throw new UsnJournalSoftFailureException();
var result = new Dictionary<string, VolumeData>();
// get filter identifying current source filter / sources configuration
// get hash identifying current source filter / sources configuration
// ReSharper disable once PossibleMultipleEnumeration
var configHash = (emitFilter == null ? string.Empty : emitFilter.GetFilterHash()) + Utility.Utility.ByteArrayAsHexString(MD5HashHelper.GetHash(m_sources));
var configHash = Utility.Utility.ByteArrayAsHexString(MD5HashHelper.GetHash(new string[] {
emitFilter == null ? string.Empty : emitFilter.ToString(),
string.Join("; ", m_sources),
fileAttributeFilter.ToString(),
skipFilesLargerThan.ToString()
}));
// create lookup for journal data
var journalDataDict = prevJournalData.ToDictionary(data => data.Volume);