h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 00:42:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #16495 from peppy/realm-integration/reinit-on-corrupt

Browse Source 
Add support for starting with a fresh realm database if the existing one is not usable
This commit is contained in:
Dan Balasescu 2022-01-19 13:30:14 +09:00 committed by GitHub
commit a0336c6fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Database/RealmContextFactory.cs
View File

@ -21,6 +21,7 @@ using osu.Game.Stores;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Scoring; using osu.Game.Scoring;
using Realms; using Realms;
using Realms.Exceptions;
#nullable enable #nullable enable
@ -105,8 +106,20 @@ namespace osu.Game.Database
if (!Filename.EndsWith(realm_extension, StringComparison.Ordinal)) if (!Filename.EndsWith(realm_extension, StringComparison.Ordinal))
Filename += realm_extension; Filename += realm_extension;
// This method triggers the first `CreateContext` call, which will implicitly run realm migrations and bring the schema up-to-date. try
cleanupPendingDeletions(); {
// This method triggers the first `CreateContext` call, which will implicitly run realm migrations and bring the schema up-to-date.
cleanupPendingDeletions();
}
catch (Exception e)
{
Logger.Error(e, "Realm startup failed with unrecoverable error; starting with a fresh database. A backup of your database has been made.");
CreateBackup($"{Filename.Replace(realm_extension, string.Empty)}_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}_corrupt{realm_extension}");
storage.Delete(Filename);
cleanupPendingDeletions();
}
} }
private void cleanupPendingDeletions() private void cleanupPendingDeletions()
@ -403,14 +416,23 @@ namespace osu.Game.Database
const int sleep_length = 200; const int sleep_length = 200;
int timeout = 5000; int timeout = 5000;
// see https://github.com/realm/realm-dotnet/discussions/2657 try
while (!Compact())
{ {
Thread.Sleep(sleep_length); // see https://github.com/realm/realm-dotnet/discussions/2657
timeout -= sleep_length; while (!Compact())
{
Thread.Sleep(sleep_length);
timeout -= sleep_length;
if (timeout < 0) if (timeout < 0)
throw new TimeoutException(@"Took too long to acquire lock"); throw new TimeoutException(@"Took too long to acquire lock");
}
}
catch (RealmException e)
{
// Compact may fail if the realm is in a bad state.
// We still want to continue with the blocking operation, though.
Logger.Log($"Realm compact failed with error {e}", LoggingTarget.Database);
} }
} }
catch catch