PublicArchive/duplicati
2
0
Fork 0
mirror of https://github.com/duplicati/duplicati.git synced 2026-05-06 07:16:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Detect default lock refresh

Browse Source 
This PR adds a probing mechanism that checks if the backup is using remote file locking and automatically sets the `--repair-refresh-lock-info` setting based on that finding.

If the backup is using `--remote-file-lock-duration` then the operation will refresh locks by default. otherwise it will not refresh locks.

If the backup sets `repair-refresh-lock-info` then that value is used.

Priority is (most important first):
- input value (from FE)
- backup `repair-refresh-lock-info` setting
- backup `remote-file-lock-duration`
- global settings `repair-refresh-lock-info`
- global settings `remote-file-lock-duration`

If the backup is using remote file locking, then most likely the user will want the repaired database to contain lock information. If remote locking is not used, the repair will now skip fetching lock information.
This commit is contained in:
Kenneth Skovhede
2026-04-30 19:48:58 +02:00
parent b364d7d16e
commit 7fdefea533
1 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/WebserverCore/Endpoints/V1/Backup/BackupPost.cs
+43 -9
View File
@@ -54,11 +54,11 @@ public class BackupPost : IEndpointV1
.RequireAuthorization();
group.MapPost("/backup/{id}/repair", ([FromServices] Connection connection, [FromServices] IQueueRunnerService queueRunnerService, [FromRoute] string id, Dto.RepairInputDto? input)
=> ExecuteRepair(GetBackup(connection, id), queueRunnerService, input))
=> ExecuteRepair(connection, GetBackup(connection, id), queueRunnerService, input))
.RequireAuthorization();
group.MapPost("/backup/{id}/repairupdate", ([FromServices] Connection connection, [FromServices] IQueueRunnerService queueRunnerService, [FromRoute] string id, Dto.RepairInputDto? input)
=> ExecuteRepairUpdate(GetBackup(connection, id), queueRunnerService, input))
=> ExecuteRepairUpdate(connection, GetBackup(connection, id), queueRunnerService, input))
.RequireAuthorization();
group.MapPost("/backup/{id}/vacuum", ([FromServices] Connection connection, [FromServices] IQueueRunnerService queueRunnerService, [FromRoute] string id)
@@ -142,11 +142,11 @@ public class BackupPost : IEndpointV1
private static Dto.TaskStartedDto ExecuteReportRemoteSize(IBackup backup, IQueueRunnerService queueRunnerService)
=> new Dto.TaskStartedDto("OK", queueRunnerService.AddTask(Runner.CreateTask(DuplicatiOperation.ListRemote, backup)));
private static Dto.TaskStartedDto ExecuteRepair(IBackup backup, IQueueRunnerService queueRunnerService, Dto.RepairInputDto? input)
=> DoRepair(backup, false, queueRunnerService, input);
private static Dto.TaskStartedDto ExecuteRepair(Connection connection, IBackup backup, IQueueRunnerService queueRunnerService, Dto.RepairInputDto? input)
=> DoRepair(connection, backup, false, queueRunnerService, input);
private static Dto.TaskStartedDto ExecuteRepairUpdate(IBackup backup, IQueueRunnerService queueRunnerService, Dto.RepairInputDto? input)
=> DoRepair(backup, true, queueRunnerService, input);
private static Dto.TaskStartedDto ExecuteRepairUpdate(Connection connection, IBackup backup, IQueueRunnerService queueRunnerService, Dto.RepairInputDto? input)
=> DoRepair(connection, backup, true, queueRunnerService, input);
private static Dto.TaskStartedDto ExecuteVacuum(IBackup backup, IQueueRunnerService queueRunnerService)
=> new Dto.TaskStartedDto("OK", queueRunnerService.AddTask(Runner.CreateTask(DuplicatiOperation.Vacuum, backup)));
@@ -157,7 +157,7 @@ public class BackupPost : IEndpointV1
private static Dto.TaskStartedDto ExecuteCompact(IBackup backup, IQueueRunnerService queueRunnerService)
=> new Dto.TaskStartedDto("OK", queueRunnerService.AddTask(Runner.CreateTask(DuplicatiOperation.Compact, backup)));
private static Dto.TaskStartedDto DoRepair(IBackup backup, bool repairUpdate, IQueueRunnerService queueRunnerService, Dto.RepairInputDto? input)
private static Dto.TaskStartedDto DoRepair(Connection connection, IBackup backup, bool repairUpdate, IQueueRunnerService queueRunnerService, Dto.RepairInputDto? input)
{
// These are all props on the input object
var extra = new Dictionary<string, string?>();
@@ -175,8 +175,17 @@ public class BackupPost : IEndpointV1
extra["version"] = input.version;
extra["ignore-update-if-version-exists"] = "true";
}
if (input.refresh_lock_info ?? false)
extra["repair-refresh-lock-info"] = "true";
// If the call explicitly asks for a refresh lock info, we use that
if (input.refresh_lock_info != null)
extra["repair-refresh-lock-info"] = input.refresh_lock_info.Value.ToString();
}
if (!extra.ContainsKey("repair-refresh-lock-info"))
{
var refresh = DetermineLockRefresh(backup.Settings) ?? DetermineLockRefresh(connection.Settings);
if (!string.IsNullOrWhiteSpace(refresh))
extra["repair-refresh-lock-info"] = refresh;
}
var filters = input?.paths ?? [];
@@ -184,6 +193,31 @@ public class BackupPost : IEndpointV1
return new Dto.TaskStartedDto("OK", queueRunnerService.AddTask(Runner.CreateTask(repairUpdate ? DuplicatiOperation.RepairUpdate : DuplicatiOperation.Repair, backup, extra, filters)));
}
private static string? DetermineLockRefresh(IEnumerable<ISetting> settings)
{
var refresh = settings.FirstOrDefault(x => string.Equals(x.Name.TrimStart('-'), "repair-refresh-lock-info"));
if (refresh != null)
return refresh.Value ?? "true";
var lock_duration = settings.FirstOrDefault(x => string.Equals(x.Name.TrimStart('-'), "remote-file-lock-duration"));
if (lock_duration != null)
{
try
{
var ts = Library.Utility.Timeparser.ParseTimeSpan(lock_duration.Value);
if (ts.Ticks > 0)
return "true";
}
catch
{
// We don't know what the lock duration is, but assume it is non-zero
return "true";
}
}
return null;
}
private static Dto.TaskStartedDto ExecuteRunBackup(IBackup backup, bool skipQueue, IQueueRunnerService queueRunnerService)
{
var t = queueRunnerService.GetCurrentTask();