Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Backup fails after recent develop release on certain platforms. (Trouble updating? see github issue #2080) 

fixes #2080
This commit is contained in:
Taloth Saldono 2017-07-29 20:27:34 +02:00
parent 432666b2da
commit 94f2473fbb
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/NzbDrone.Core/Backup/MakeDatabaseBackup.cs
View File

@ -30,6 +30,8 @@ namespace NzbDrone.Core.Backup
var backupConnectionStringBuilder = new SQLiteConnectionStringBuilder(sourceConnectionString); var backupConnectionStringBuilder = new SQLiteConnectionStringBuilder(sourceConnectionString);
backupConnectionStringBuilder.DataSource = Path.Combine(targetDirectory, Path.GetFileName(backupConnectionStringBuilder.DataSource)); backupConnectionStringBuilder.DataSource = Path.Combine(targetDirectory, Path.GetFileName(backupConnectionStringBuilder.DataSource));
// We MUST use journal mode instead of WAL coz WAL has issues when page sizes change. This should also automatically deal with the -journal and -wal files during restore.
backupConnectionStringBuilder.JournalMode = SQLiteJournalModeEnum.Truncate;
using (var sourceConnection = (SQLiteConnection)SQLiteFactory.Instance.CreateConnection()) using (var sourceConnection = (SQLiteConnection)SQLiteFactory.Instance.CreateConnection())
using (var backupConnection = (SQLiteConnection)SQLiteFactory.Instance.CreateConnection()) using (var backupConnection = (SQLiteConnection)SQLiteFactory.Instance.CreateConnection())
@ -42,23 +44,16 @@ namespace NzbDrone.Core.Backup
sourceConnection.BackupDatabase(backupConnection, "main", "main", -1, null, 500); sourceConnection.BackupDatabase(backupConnection, "main", "main", -1, null, 500);
// Make sure there are no lingering connections so the wal gets truncated. // The backup changes the journal_mode, force it to truncate again.
using (var command = backupConnection.CreateCommand())
{
command.CommandText = "pragma journal_mode=truncate";
command.ExecuteNonQuery();
}
// Make sure there are no lingering connections.
SQLiteConnection.ClearAllPools(); SQLiteConnection.ClearAllPools();
} }
var backupWalPath = backupConnectionStringBuilder.DataSource + "-wal";
if (backupConnectionStringBuilder.JournalMode == SQLiteJournalModeEnum.Wal && !File.Exists(backupWalPath))
{
// Make sure the wal gets created in the backup so users are less likely to make an error during restore.
File.WriteAllBytes(backupWalPath, new byte[0]);
}
var backupJournalPath = backupConnectionStringBuilder.DataSource + "-journal";
if (backupConnectionStringBuilder.JournalMode != SQLiteJournalModeEnum.Wal && !File.Exists(backupJournalPath))
{
// Make sure the journal gets created in the backup so users are less likely to make an error during restore.
File.WriteAllBytes(backupJournalPath, new byte[0]);
}
} }
} }
} }