Skip to content

fix loop trn missing #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seguins merged 1 commit into from
Oct 1, 2025
Merged

fix loop trn missing #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/SqlBackupTools/Restore/Native/NativeRestoreMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,7 @@ private async Task RestoreLogAsync(RestoreItem item, FileInfo lastRestored, SqlC
_state.Loggger.Debug("Scraping TRN files from " + restoreLogsFrom);

var backupLogsToRestore = new Stack<(FileInfo logFile, RetryStrategy retry)>();
foreach (var logFileInfo in item.Log
.EnumerateFiles("*.trn", SearchOption.TopDirectoryOnly)
.Where(l => l.BackupDate() > restoreLogsFrom)
.OrderByDescending(l => l.BackupDate()))
foreach (var logFileInfo in ListTrnFromDisk(item, restoreLogsFrom))
{
backupLogsToRestore.Push((logFileInfo, RetryStrategy.None));
}
Expand All @@ -229,6 +226,7 @@ private async Task RestoreLogAsync(RestoreItem item, FileInfo lastRestored, SqlC
_state.Loggger.Debug(backupLogsToRestore.Count + " trn files to restore");

int retryCountUsedFile = 3;
int retryMissingTrn = 3;
while (backupLogsToRestore.Count != 0)
{
var (currentLogFile, retryStrategy) = backupLogsToRestore.Pop();
Expand Down Expand Up @@ -268,6 +266,7 @@ private async Task RestoreLogAsync(RestoreItem item, FileInfo lastRestored, SqlC
}
await Task.Delay(10_000); // 10s
backupLogsToRestore.Push((currentLogFile, RetryStrategy.None));
continue;
}
catch (SqlException sqle)
when (sqle.Number == 4326)
Expand All @@ -278,6 +277,12 @@ private async Task RestoreLogAsync(RestoreItem item, FileInfo lastRestored, SqlC
catch (SqlException sqle)
when (sqle.Number == 4305)
{
if (retryMissingTrn-- == 0)
{
throw;
}
await Task.Delay(10_000); // 10s

//The log in this backup set begins at LSN x, which is too recent to apply to the database. An earlier log backup that includes LSN x can be restored.

// - retrying the last log with extract from HeaderOnly
Expand All @@ -287,8 +292,15 @@ private async Task RestoreLogAsync(RestoreItem item, FileInfo lastRestored, SqlC
var ex = await DropDatabaseWhileTryingRestore(item, sqlConnection);
throw new BackupRestoreException("The log in this backup set begins at LSN x, which is too recent to apply to the database. We're dropping the DB, and will try restore full on next loop.", ex);
}
backupLogsToRestore.Push((currentLogFile, RetryStrategy.None));

backupLogsToRestore.Clear();
IOrderedEnumerable<FileInfo> logFilesInfo = ListTrnFromDisk(item, lastLogFile.BackupDate());
foreach (var logFileInfo in logFilesInfo)
{
backupLogsToRestore.Push((logFileInfo, RetryStrategy.None));
}
backupLogsToRestore.Push((lastLogFile, RetryStrategy.ExtractHeaders));
continue;
}

lastLogFile = currentLogFile;
Expand All @@ -310,6 +322,14 @@ private async Task RestoreLogAsync(RestoreItem item, FileInfo lastRestored, SqlC
}
}

private static IOrderedEnumerable<FileInfo> ListTrnFromDisk(RestoreItem item, DateTime restoreLogsFrom)
{
return item.Log
.EnumerateFiles("*.trn", SearchOption.TopDirectoryOnly)
.Where(l => l.BackupDate() > restoreLogsFrom)
.OrderByDescending(l => l.BackupDate());
}

private async Task<string> RestoreFullSqlCommandAsync(RestoreItem item, bool modeFileList,
SqlConnection sqlConnection, FileInfo fullFile)
{
Expand Down