Only allow timers to execute if the grain is active or deactivating.

dotnet · May 29, 2024 · 9d9287b · 9d9287b
1 parent 628833f
commit 9d9287b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Orleans.Runtime/Catalog/ActivationData.cs b/src/Orleans.Runtime/Catalog/ActivationData.cs
@@ -869,8 +869,8 @@ void ProcessPendingRequests()
                     message = _waitingRequests[i].Message;
 
                     // If the activation is not valid, reject all pending messages except for local-only messages.
-                    // Local-only messages are used for internal system operations and should not be rejected.
-                    if (State != ActivationState.Valid && !message.IsLocalOnly)
+                    // Local-only messages are used for internal system operations and should not be rejected while the grain is valid or deactivating.
+                    if (State != ActivationState.Valid && !(message.IsLocalOnly && State is ActivationState.Deactivating))
                     {
                         ProcessRequestsToInvalidActivation();
                         break;