yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle maindom was acquired doing install, so we do not have our lock Id in the database..

Browse Source
This commit is contained in:
Bjarke Berg
2021-09-21 12:28:49 +02:00
parent 63807bc65f
commit 8d74efb635
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
View File

@@ -40,7 +40,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime
private bool _errorDuringAcquiring;
private readonly object _locker = new object();
private bool _hasTable = false;
private bool _acquireWhenTablesNotAvailable = false;
public SqlMainDomLock(
ILogger<SqlMainDomLock> logger,
ILoggerFactory loggerFactory,
@@ -99,7 +99,8 @@ namespace Umbraco.Cms.Infrastructure.Runtime
_hasTable = db.HasTable(Cms.Core.Constants.DatabaseSchema.Tables.KeyValue);
if (!_hasTable)
{
// the Db does not contain the required table, we must be in an install state we have no choice but to assume we can acquire
_logger.LogDebug("The DB does not contain the required table, we must be in an install state we have no choice but to assume we can acquire");
_acquireWhenTablesNotAvailable = true;
return true;
}
@@ -225,6 +226,13 @@ namespace Umbraco.Cms.Infrastructure.Runtime
}
}
// In case we acquired the main dom doing install, there was no database. We therefore has to insert our lockId now, but only handle this once.
if (_acquireWhenTablesNotAvailable)
{
_acquireWhenTablesNotAvailable = false;
InsertLockRecord(_lockId, db);
}
db.BeginTransaction(IsolationLevel.ReadCommitted);
// get a read lock
_sqlServerSyntax.ReadLock(db, Cms.Core.Constants.Locks.MainDom);
@@ -434,7 +442,10 @@ namespace Umbraco.Cms.Infrastructure.Runtime
private bool IsMainDomValue(string val, IUmbracoDatabase db)
{
return db.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoKeyValue WHERE [key] = @key AND [value] = @val",
new { key = MainDomKey, val = val }) == 1;
new { key = MainDomKey, val = val }) == 1;
}
/// <summary>
@@ -447,6 +458,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime
#region IDisposable Support
private bool _disposedValue = false; // To detect redundant calls
protected virtual void Dispose(bool disposing)
{
if (!_disposedValue)