Skip to content

Commit 62f4666

Browse files
authored
Remove the hard upper limit for SQL write lock timeout (#18260)
1 parent 460c0b3 commit 62f4666

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

src/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidator.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,14 @@ private bool ValidateSmtpSetting(SmtpSettings? value, out string message) =>
3232

3333
private bool ValidateSqlWriteLockTimeOutSetting(TimeSpan configuredTimeOut, out string message)
3434
{
35-
// Only apply this setting if it's not excessively high or low
35+
// Only apply this setting if it's not excessively low
3636
const int minimumTimeOut = 100;
37-
const int maximumTimeOut = 20000;
3837

3938
// between 0.1 and 20 seconds
40-
if (configuredTimeOut.TotalMilliseconds < minimumTimeOut ||
41-
configuredTimeOut.TotalMilliseconds > maximumTimeOut)
39+
if (configuredTimeOut.TotalMilliseconds < minimumTimeOut)
4240
{
4341
message =
44-
$"The `{Constants.Configuration.ConfigGlobal}:{nameof(GlobalSettings.DistributedLockingWriteLockDefaultTimeout)}` setting is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms";
42+
$"The `{Constants.Configuration.ConfigGlobal}:{nameof(GlobalSettings.DistributedLockingWriteLockDefaultTimeout)}` should not be configured as less than {minimumTimeOut} ms";
4543
return false;
4644
}
4745

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ public void Returns_Fail_For_Configuration_With_Insufficient_SqlWriteLockTimeOut
3939
Assert.False(result.Succeeded);
4040
}
4141

42-
[Test]
43-
public void Returns_Fail_For_Configuration_With_Excessive_SqlWriteLockTimeOut()
44-
{
45-
var validator = new GlobalSettingsValidator();
46-
var options = new GlobalSettings { DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:21") };
47-
48-
var result = validator.Validate("settings", options);
49-
Assert.False(result.Succeeded);
50-
}
51-
5242
[Test]
5343
public void Returns_Success_For_Configuration_With_Valid_SqlWriteLockTimeOut()
5444
{

0 commit comments

Comments
 (0)