Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't throw lock timeout if shell activated #14756

Merged
merged 2 commits into from
Nov 26, 2023
Merged

Don't throw lock timeout if shell activated #14756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
873fb95
Don't throw on timeout if shell activated
jtkech Nov 26, 2023
c75e907
Remove testing code
jtkech Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@ internal async Task ActivateShellInternalAsync()
(var locker, var locked) = await ShellContext.TryAcquireShellActivateLockAsync();
if (!locked)
{
// The retry logic increases the delay between 2 attempts (max of 10s), so if there are too
// many concurrent requests, one may experience a timeout while waiting before a new retry.
if (ShellContext.IsActivated)
{
// Don't throw if the shell is activated.
return;
}

throw new TimeoutException($"Failed to acquire a lock before activating the tenant: {ShellContext.Settings.Name}");
}

Expand Down