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

Remove the hard upper limit for SQL write lock timeout (#18260)

Browse Source
This commit is contained in:
Kenn Jacobsen
2025-02-07 07:37:11 +01:00
committed by GitHub
parent 460c0b3253
commit 62f46667d2
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidator.cs
View File

@@ -32,16 +32,14 @@ public class GlobalSettingsValidator
private bool ValidateSqlWriteLockTimeOutSetting(TimeSpan configuredTimeOut, out string message)
{
// Only apply this setting if it's not excessively high or low
// Only apply this setting if it's not excessively low
const int minimumTimeOut = 100;
const int maximumTimeOut = 20000;
// between 0.1 and 20 seconds
if (configuredTimeOut.TotalMilliseconds < minimumTimeOut ||
configuredTimeOut.TotalMilliseconds > maximumTimeOut)
if (configuredTimeOut.TotalMilliseconds < minimumTimeOut)
{
message =
$"The `{Constants.Configuration.ConfigGlobal}:{nameof(GlobalSettings.DistributedLockingWriteLockDefaultTimeout)}` setting is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms";
$"The `{Constants.Configuration.ConfigGlobal}:{nameof(GlobalSettings.DistributedLockingWriteLockDefaultTimeout)}` should not be configured as less than {minimumTimeOut} ms";
return false;
}

10
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs
View File

@@ -39,16 +39,6 @@ public class GlobalSettingsValidatorTests
Assert.False(result.Succeeded);
}
[Test]
public void Returns_Fail_For_Configuration_With_Excessive_SqlWriteLockTimeOut()
{
var validator = new GlobalSettingsValidator();
var options = new GlobalSettings { DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:21") };
var result = validator.Validate("settings", options);
Assert.False(result.Succeeded);
}
[Test]
public void Returns_Success_For_Configuration_With_Valid_SqlWriteLockTimeOut()
{