Don't throw lock timeout if shell activated (#14756)

src/OrchardCore/OrchardCore.Abstractions/Shell/Scope/ShellScope.cs

@@ -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}");
             }