Converted exceptions while adding an unmodified file to the database …

…to a log message to avoid stopping the backup when this errors out.
duplicati · Aug 14, 2018 · 5e130fa · 5e130fa · duplicatibot · Dec 17, 2018
1 parent c00e6fd
commit 5e130fa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/Duplicati/Library/Main/Operation/Backup/FileBlockProcessor.cs b/Duplicati/Library/Main/Operation/Backup/FileBlockProcessor.cs
@@ -120,7 +120,15 @@ public static Task Run(Snapshots.ISnapshotService snapshot, Options options, Bac
                         {
                             // When we write the file to output, update the last modified time
                             Logging.Log.WriteVerboseMessage(FILELOGTAG, "NoFileChanges", "File has not changed {0}", e.Path);
-                            await database.AddUnmodifiedAsync(e.OldId, e.LastWrite);
+
+                            try
+                            {
+                                await database.AddUnmodifiedAsync(e.OldId, e.LastWrite);
+                            }
+                            catch (Exception ex)
+                            {
+                                Logging.Log.WriteWarningMessage(FILELOGTAG, "FailedToAddFile", ex, "Failed while attempting to add unmodified file to database: {0}", e.Path);
+                            }
                         }
                     }
                     catch(Exception ex)

diff --git a/Duplicati/Library/Main/Operation/Backup/FilePreFilterProcess.cs b/Duplicati/Library/Main/Operation/Backup/FilePreFilterProcess.cs
@@ -98,7 +98,16 @@ public static Task Run(Snapshots.ISnapshotService snapshot, Options options, Bac
                     if (CHECKFILETIMEONLY && !timestampChanged && !isNewFile)
                     {
                         Logging.Log.WriteVerboseMessage(FILELOGTAG, "SkipCheckNoTimestampChange", "Skipped checking file, because timestamp was not updated {0}", e.Path);                                                
-                        await database.AddUnmodifiedAsync(e.OldId, e.LastWrite);
+                        try
+                        {
+                            await database.AddUnmodifiedAsync(e.OldId, e.LastWrite);
+                        }
+                        catch (Exception ex)
+                        {
+                            if (ex.IsRetiredException())
+                                throw;
+                            Logging.Log.WriteWarningMessage(FILELOGTAG, "FailedToAddFile", ex, "Failed while attempting to add unmodified file to database: {0}", e.Path);
+                        }
                         continue;
                     }
 
@@ -127,8 +136,15 @@ public static Task Run(Snapshots.ISnapshotService snapshot, Options options, Bac
                     }
                     else
                     {
-                        Logging.Log.WriteVerboseMessage(FILELOGTAG, "SkipCheckNoMetadataChange", "Skipped checking file, because no metadata was updated {0}", e.Path);                                                
-                        await database.AddUnmodifiedAsync(e.OldId, e.LastWrite);
+                        Logging.Log.WriteVerboseMessage(FILELOGTAG, "SkipCheckNoMetadataChange", "Skipped checking file, because no metadata was updated {0}", e.Path);
+                        try
+                        {
+                            await database.AddUnmodifiedAsync(e.OldId, e.LastWrite);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.Log.WriteWarningMessage(FILELOGTAG, "FailedToAddFile", ex, "Failed while attempting to add unmodified file to database: {0}", e.Path);
+                        }
                     }
                 }
             });