Merge pull request #4042 from seantempleton/stopnowexceptions

Fix database corruptions that can occur with "stop now". This was a source of the "Detected non-empty blocksets with no associated blocks!" exception.
duplicati · Jan 6, 2020 · 52929e9 · 52929e9
2 parents df2c70e + 3b6306b
commit 52929e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Duplicati/Library/Main/Database/LocalDatabase.cs b/Duplicati/Library/Main/Database/LocalDatabase.cs
@@ -439,7 +439,7 @@ public void RemoveRemoteVolumes(IEnumerable<string> names, System.Data.IDbTransa
                 deletecmd.ExecuteNonQuery(string.Format(@"DELETE FROM ""Blockset"" WHERE ""ID"" IN ({0})", bsIdsSubQuery));
                 deletecmd.ExecuteNonQuery(string.Format(@"DELETE FROM ""BlocksetEntry"" WHERE ""BlocksetID"" IN ({0})", bsIdsSubQuery));
 
-                deletecmd.ExecuteNonQuery(string.Format(@"DELETE FROM ""BlocklistHash"" WHERE ""Hash"" IN (SELECT ""Hash"" FROM ""Block"" WHERE ""VolumeID"" IN ({0}))", volIdsSubQuery));
+                deletecmd.ExecuteNonQuery(string.Format(@"DELETE FROM ""BlocklistHash"" WHERE ""BlocklistHash"".""BlocksetID"" IN ({0})", bsIdsSubQuery));
                 deletecmd.ExecuteNonQuery(string.Format(@"DELETE FROM ""Block"" WHERE ""VolumeID"" IN ({0})", volIdsSubQuery));
                 deletecmd.ExecuteNonQuery(string.Format(@"DELETE FROM ""DeletedBlock"" WHERE ""VolumeID"" IN ({0})", volIdsSubQuery));
 

diff --git a/Duplicati/Library/Main/Operation/Backup/DataBlockProcessor.cs b/Duplicati/Library/Main/Operation/Backup/DataBlockProcessor.cs
@@ -108,10 +108,12 @@ public static Task Run(BackupDatabase database, Options options, ITaskReader tas
                                 }
 
                                 var uploadRequest = new VolumeUploadRequest(blockvolume, blockEntry, indexVolumeCopy, options, database);
-                                await self.Output.WriteAsync(uploadRequest);
 
                                 blockvolume = null;
                                 indexvolume = null;
+
+                                // Write to output at the end here to prevent sending a full volume to the SpillCollector
+                                await self.Output.WriteAsync(uploadRequest);
                             }
 
                         }

diff --git a/Duplicati/Library/Utility/RegistryUtility.cs b/Duplicati/Library/Utility/RegistryUtility.cs
@@ -36,7 +36,7 @@ public static string GetDataByValueName(string parentKeyName, string name)
                 }
 
                 var lmParentKey = Registry.LocalMachine.OpenSubKey(parentKeyName, RegistryKeyPermissionCheck.ReadSubTree);
-                return lmParentKey.GetValue(name).ToString();
+                return lmParentKey?.GetValue(name).ToString();
             }
             catch
             {