Added grace-period for incomplete uploads to avoid backups stopping d…

…ue to the Apache WebDAV issues.

This fixes #1243.

Duplicati/Library/Main/Database/Database schema/3. Add grace delete period.sql

@@ -0,0 +1,18 @@
+
+CREATE TABLE "RemoteVolume_Temp" (
+	"ID" INTEGER PRIMARY KEY,
+	"OperationID" INTEGER NOT NULL,
+	"Name" TEXT NOT NULL,
+	"Type" TEXT NOT NULL,
+	"Size" INTEGER NULL,
+	"Hash" TEXT NULL,
+	"State" TEXT NOT NULL,
+	"VerificationCount" INTEGER NOT NULL,
+	"DeleteGraceTime" INTEGER NOT NULL
+);
+
+INSERT INTO "RemoteVolume_Temp" SELECT "ID", "OperationID", "Name", "Type", "Size", "Hash", "State", "VerificationCount", 0 FROM "RemoteVolume";
+DROP TABLE "RemoteVolume";
+ALTER TABLE "RemoteVolume_Temp" RENAME TO "RemoteVolume";
+
+UPDATE "Version" SET "Version" = 3;

Duplicati/Library/Main/Database/Database schema/Schema.sql

@@ -22,7 +22,8 @@ CREATE TABLE "Remotevolume" (
 	"Size" INTEGER NULL,
 	"Hash" TEXT NULL,
 	"State" TEXT NOT NULL,
-	"VerificationCount" INTEGER NOT NULL
+	"VerificationCount" INTEGER NOT NULL,
+	"DeleteGraceTime" INTEGER NOT NULL
 );
 
 /* Index for detecting broken states */
@@ -219,4 +220,4 @@ CREATE TABLE "Configuration" (
 	"Value" TEXT NOT NULL
 );
 
-INSERT INTO "Version" ("Version") VALUES (2);
+INSERT INTO "Version" ("Version") VALUES (3);

Duplicati/Library/Main/Database/LocalBackupDatabase.cs

@@ -763,15 +763,15 @@ public IRemoteVolume GetRemoteVolumeFromName(string name)
             using(var cmd = m_connection.CreateCommand())
             using(var rd = cmd.ExecuteReader(@"SELECT ""Name"", ""Hash"", ""Size"" FROM ""RemoteVolume"" WHERE ""Name"" = ?", name))
                 if (rd.Read())
-                    return new RemoteVolume(rd.GetValue(0).ToString(), rd.GetValue(1).ToString(), rd.GetInt64(2));
+                    return new RemoteVolume(rd.GetValue(0).ToString(), rd.GetValue(1).ToString(), rd.ConvertValueToInt64(2));
                 else
                     return null;
         }
 
         public IEnumerable<string> GetMissingIndexFiles()
         {
             using(var cmd = m_connection.CreateCommand())
-            using(var rd = cmd.ExecuteReader(@"SELECT ""Name"" FROM ""RemoteVolume"" WHERE ""Type"" = ""Blocks"" AND NOT ""ID"" IN (SELECT ""BlockVolumeID"" FROM ""IndexBlockLink"")"))
+            using(var rd = cmd.ExecuteReader(@"SELECT ""Name"" FROM ""RemoteVolume"" WHERE ""Type"" = ? AND NOT ""ID"" IN (SELECT ""BlockVolumeID"" FROM ""IndexBlockLink"") AND ""State"" IN (?,?)", RemoteVolumeType.Blocks.ToString(), RemoteVolumeState.Uploaded.ToString(), RemoteVolumeState.Verified.ToString()))
                 while (rd.Read())
                     yield return rd.GetValue(0).ToString();
         }

Duplicati/Library/Main/Database/LocalDatabase.cs

@@ -108,7 +108,7 @@ private LocalDatabase(System.Data.IDbConnection connection)
             m_updateremotevolumeCommand.CommandText = @"UPDATE ""Remotevolume"" SET ""OperationID"" = ?, ""State"" = ?, ""Hash"" = ?, ""Size"" = ? WHERE ""Name"" = ?";
             m_updateremotevolumeCommand.AddParameters(5);
 
-            m_selectremotevolumesCommand.CommandText = @"SELECT ""Name"", ""Type"", ""Size"", ""Hash"", ""State"" FROM ""Remotevolume""";
+            m_selectremotevolumesCommand.CommandText = @"SELECT ""Name"", ""Type"", ""Size"", ""Hash"", ""State"", ""DeleteGraceTime"" FROM ""Remotevolume""";
 
             m_selectremotevolumeCommand.CommandText = @"SELECT ""Type"", ""Size"", ""Hash"", ""State"" FROM ""Remotevolume"" WHERE ""Name"" = ?";
             m_selectremotevolumeCommand.AddParameter();
@@ -118,8 +118,8 @@ private LocalDatabase(System.Data.IDbConnection connection)
 
 			m_selectremotevolumeIdCommand.CommandText = @"SELECT ""ID"" FROM ""Remotevolume"" WHERE ""Name"" = ?";
 
-			m_createremotevolumeCommand.CommandText = @"INSERT INTO ""Remotevolume"" (""OperationID"", ""Name"", ""Type"", ""State"", ""VerificationCount"") VALUES (?, ?, ?, ?, ?); SELECT last_insert_rowid();";
-            m_createremotevolumeCommand.AddParameters(5);
+			m_createremotevolumeCommand.CommandText = @"INSERT INTO ""Remotevolume"" (""OperationID"", ""Name"", ""Type"", ""State"", ""VerificationCount"", ""DeleteGraceTime"") VALUES (?, ?, ?, ?, ?, ?); SELECT last_insert_rowid();";
+            m_createremotevolumeCommand.AddParameters(6);
 
             m_insertIndexBlockLink.CommandText = @"INSERT INTO ""IndexBlockLink"" (""IndexVolumeID"", ""BlockVolumeID"") VALUES (?, ?)";
             m_insertIndexBlockLink.AddParameters(2);
@@ -269,9 +269,10 @@ public IEnumerable<RemoteVolumeEntry> GetRemoteVolumes()
                     yield return new RemoteVolumeEntry(
                         rd.GetValue(0).ToString(),
                         (rd.GetValue(3) == null || rd.GetValue(3) == DBNull.Value) ? null : rd.GetValue(3).ToString(),
-                        (rd.GetValue(2) == null || rd.GetValue(2) == DBNull.Value) ? -1 : rd.GetInt64(2),
+                        rd.ConvertValueToInt64(2, -1),
                         (RemoteVolumeType)Enum.Parse(typeof(RemoteVolumeType), rd.GetValue(1).ToString()),
-                        (RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(4).ToString())
+                        (RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(4).ToString()),
+                        new DateTime(rd.ConvertValueToInt64(5, 0), DateTimeKind.Utc)
                     );
                 }
             }
@@ -351,7 +352,17 @@ public void Vacuum()
                 cmd.ExecuteNonQuery("VACUUM");
         }
 
-		public long RegisterRemoteVolume(string name, RemoteVolumeType type, RemoteVolumeState state, System.Data.IDbTransaction transaction = null)
+        public long RegisterRemoteVolume(string name, RemoteVolumeType type, RemoteVolumeState state)
+        {
+            return RegisterRemoteVolume(name, type, state, new TimeSpan(0), null);
+        }
+
+        public long RegisterRemoteVolume(string name, RemoteVolumeType type, RemoteVolumeState state, System.Data.IDbTransaction transaction)
+        {
+            return RegisterRemoteVolume(name, type, state, new TimeSpan(0), transaction);
+        }
+
+        public long RegisterRemoteVolume(string name, RemoteVolumeType type, RemoteVolumeState state, TimeSpan deleteGraceTime, System.Data.IDbTransaction transaction)
 		{
         	using(var tr = new TemporaryTransactionWrapper(m_connection, transaction))
         	{
@@ -360,6 +371,12 @@ public long RegisterRemoteVolume(string name, RemoteVolumeType type, RemoteVolum
                 m_createremotevolumeCommand.SetParameterValue(2, type.ToString());
                 m_createremotevolumeCommand.SetParameterValue(3, state.ToString());
                 m_createremotevolumeCommand.SetParameterValue(4, 0);
+
+                if (deleteGraceTime.Ticks <= 0)
+                    m_createremotevolumeCommand.SetParameterValue(5, 0);
+                else
+                    m_createremotevolumeCommand.SetParameterValue(5, (DateTime.UtcNow + deleteGraceTime).Ticks);
+
                 m_createremotevolumeCommand.Transaction = tr.Parent;
                 var r = m_createremotevolumeCommand.ExecuteScalarInt64();
                 tr.Commit();

Duplicati/Library/Main/Database/RemoteVolumeEntry.cs

@@ -12,20 +12,23 @@ public struct RemoteVolumeEntry : IRemoteVolume
     	private readonly long m_size;
     	private readonly RemoteVolumeType m_type;
     	private readonly RemoteVolumeState m_state;
+        private readonly DateTime m_deleteGracePeriod;
 
         public string Name { get { return m_name; } }
         public string Hash { get { return m_hash; } }
         public long Size { get { return m_size; } }
         public RemoteVolumeType Type { get { return m_type; } }
         public RemoteVolumeState State { get { return m_state; } }
+        public DateTime deleteGracePeriod { get { return m_deleteGracePeriod; } }
 
-        public RemoteVolumeEntry(string name, string hash, long size, RemoteVolumeType type, RemoteVolumeState state)
+        public RemoteVolumeEntry(string name, string hash, long size, RemoteVolumeType type, RemoteVolumeState state, DateTime deleteGracePeriod)
         {
             m_name = name;
             m_size = size;
             m_type = type;
             m_state = state;
             m_hash = hash;
+            m_deleteGracePeriod = deleteGracePeriod;
         }
     }
 }

Duplicati/Library/Main/Duplicati.Library.Main.csproj

@@ -151,6 +151,7 @@
     <EmbeddedResource Include="Database\Database schema\Schema.sql" />
     <EmbeddedResource Include="Database\Database schema\1. Add index.sql" />
     <EmbeddedResource Include="Database\Database schema\2. Use Lastmodified.sql" />
+    <EmbeddedResource Include="Database\Database schema\3. Add grace delete period.sql" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Duplicati/Library/Main/Operation/BackupHandler.cs

@@ -397,6 +397,7 @@ orderby n.Key
 
                 foreach(var blockfile in m_database.GetMissingIndexFiles())
                 {
+                    m_result.AddMessage(string.Format("Re-creating missing index file for {0}", blockfile));
                     var w = new IndexVolumeWriter(m_options);
                     w.VolumeID = m_database.RegisterRemoteVolume(w.RemoteFilename, RemoteVolumeType.Index, RemoteVolumeState.Temporary, null);
 

Duplicati/Library/Main/Operation/FilelistProcessor.cs

@@ -242,8 +242,15 @@ public static RemoteAnalysisResult RemoteListAnalysis(BackendManager backend, Op
                         }
                         else
                         {
-                            log.AddMessage(string.Format("removing file listed as {0}: {1}", i.State, i.Name));
-                            database.RemoveRemoteVolume(i.Name, null);
+                            if (i.deleteGracePeriod > DateTime.UtcNow)
+                            {
+                                log.AddMessage(string.Format("keeping delete request for {0} until {1}", i.Name, i.deleteGracePeriod.ToLocalTime()));
+                            }
+                            else
+                            {
+                                log.AddMessage(string.Format("removing file listed as {0}: {1}", i.State, i.Name));
+                                database.RemoveRemoteVolume(i.Name, null);
+                            }
                         }
                         break;
                     case RemoteVolumeState.Uploading:
@@ -256,7 +263,8 @@ public static RemoteAnalysisResult RemoteListAnalysis(BackendManager backend, Op
                         {
                             log.AddMessage(string.Format("scheduling missing file for deletion, currently listed as {0}: {1}", i.State, i.Name));
                             database.RemoveRemoteVolume(i.Name, null);
-                            database.RegisterRemoteVolume(i.Name, i.Type, RemoteVolumeState.Deleting, null);
+                            database.RegisterRemoteVolume(i.Name, i.Type, RemoteVolumeState.Deleting, TimeSpan.FromHours(2), null);
+                            database.UpdateRemoteVolume(i.Name, RemoteVolumeState.Deleting, i.Size, i.Hash, null);
                         }
                         else
                         {