Calls issued from clients to StatelessWorker grains should be spread across silos

src/Orleans.Core.Abstractions/Concurrency/GrainAttributeConcurrency.cs

@@ -43,6 +43,7 @@ public void Populate(IServiceProvider services, Type grainClass, GrainType grain
     /// messages is not significant.
     /// </summary>
     [AttributeUsage(AttributeTargets.Interface)]
+    [Obsolete("This attribute has no effect and should be removed.")]
     public sealed class UnorderedAttribute : Attribute
     {
     }

src/Orleans.Core.Abstractions/Runtime/GrainReference.cs

@@ -274,6 +274,11 @@ public class GrainReference : IAddressable, IEquatable<GrainReference>, ISpanFor
         /// </summary>
         internal IGrainReferenceRuntime Runtime => Shared.Runtime;
 
+        /// <summary>
+        /// Gets the flags for all calls made by this reference.
+        /// </summary>
+        internal InvokeMethodOptions InvokeMethodOptions => Shared.InvokeMethodOptions;
+
         /// <summary>
         /// Gets the grain id.
         /// </summary>
@@ -377,7 +382,6 @@ public uint GetUniformHashCode()
         {
             if (reference1 is null) return !(reference2 is null);
 
-
             return !reference1.Equals(reference2);
         }
 
@@ -409,7 +413,7 @@ bool ISpanFormattable.TryFormat(Span<char> destination, out int charsWritten, Re
         /// <returns>The result of the invocation.</returns>
         protected ValueTask<T> InvokeAsync<T>(IRequest methodDescription)
         {
-            return this.Runtime.InvokeMethodAsync<T>(this, methodDescription, methodDescription.Options);
+            return this.Runtime.InvokeMethodAsync<T>(this, methodDescription, methodDescription.Options | InvokeMethodOptions);
         }
 
         /// <summary>
@@ -419,7 +423,7 @@ protected ValueTask<T> InvokeAsync<T>(IRequest methodDescription)
         /// <returns>A <see cref="ValueTask"/> representing the operation.</returns>
         protected ValueTask InvokeAsync(IRequest methodDescription)
         {
-            return this.Runtime.InvokeMethodAsync(this, methodDescription, methodDescription.Options);
+            return this.Runtime.InvokeMethodAsync(this, methodDescription, methodDescription.Options | InvokeMethodOptions);
         }
 
         /// <summary>
@@ -428,7 +432,7 @@ protected ValueTask InvokeAsync(IRequest methodDescription)
         /// <param name="methodDescription">The method description.</param>
         protected void Invoke(IRequest methodDescription)
         {
-            this.Runtime.InvokeMethod(this, methodDescription, methodDescription.Options);
+            this.Runtime.InvokeMethod(this, methodDescription, methodDescription.Options | InvokeMethodOptions);
         }
     }
 

src/Orleans.Core/SystemTargetInterfaces/IMembershipTable.cs

@@ -103,7 +103,6 @@ public interface IMembershipTable
     /// <summary>
     /// Membership table interface for system target based implementation.
     /// </summary>
-    [Unordered]
     public interface IMembershipTableSystemTarget : IMembershipTable, ISystemTarget
     {
     }

src/Orleans.Reminders/SystemTargetInterfaces/IReminderTable.cs

@@ -86,7 +86,6 @@ Task StartAsync(CancellationToken cancellationToken = default)
     /// <summary>
     /// Reminder table interface for grain based implementation.
     /// </summary>
-    [Unordered]
     internal interface IReminderTableGrain : IGrainWithIntegerKey
     {
         Task<ReminderTableData> ReadRows(GrainId grainId);

test/Grains/TestGrainInterfaces/CodegenTestInterfaces.cs

@@ -42,7 +42,6 @@ public interface ISomeGrain : IGrainWithIntegerKey
         Task Do(Outsider o);
     }
 
-    [Unordered]
     public interface ISomeGrainWithInvocationOptions : IGrainWithIntegerKey
     {
         [AlwaysInterleave]

test/Grains/TestGrainInterfaces/IReentrancyGrain.cs

@@ -50,16 +50,6 @@ public interface IMayInterleaveInstancedPredicateGrain : IGrainWithIntegerKey
         Task SetSelf(IMayInterleaveInstancedPredicateGrain self);
     }
 
-    [Unordered]
-    public interface IUnorderedNonReentrantGrain : IGrainWithIntegerKey
-    {
-        Task<string> One();
-
-        Task<string> Two();
-
-        Task SetSelf(IUnorderedNonReentrantGrain self);
-    }
-
     public interface IReentrantSelfManagedGrain : IGrainWithIntegerKey
     {
         Task<int> GetCounter();

test/Grains/TestGrains/ReentrantGrain.cs

@@ -239,27 +239,6 @@ public Task SetSelf(IMayInterleaveInstancedPredicateGrain self)
         }
     }
 
-    public class UnorderedNonRentrantGrain : Grain, IUnorderedNonReentrantGrain
-    {
-        private IUnorderedNonReentrantGrain Self { get; set; }
-
-        public Task<string> One()
-        {
-            return Task.FromResult("one");
-        }
-
-        public async Task<string> Two()
-        {
-            return await Self.One() + " two";
-        }
-
-        public Task SetSelf(IUnorderedNonReentrantGrain self)
-        {
-            Self = self;
-            return Task.CompletedTask;
-        }
-    }
-    [Reentrant]
     public class ReentrantSelfManagedGrain1 : Grain, IReentrantSelfManagedGrain
     {
         private long destination;

test/TesterInternal/General/GrainPlacementTests.cs

@@ -119,14 +119,14 @@ public async Task StatelessWorkerShouldCreateSpecifiedActivationCount()
             {
                 // note: this amount should agree with both the specified minimum and maximum in the StatelessWorkerPlacement attribute
                 // associated with ILocalPlacementTestGrain.
-                const int expected = 1;
+                var expected = 1 * _fixture.HostedCluster.Silos.Count;
                 var grain = _fixture.GrainFactory.GetGrain<IStatelessWorkerPlacementTestGrain>(Guid.NewGuid());
                 int actual = await ActivationCount(grain, expected * 50);
                 Assert.True(actual <= expected, $"Created more activations than the specified limit: {actual} > {expected}.");
             }
 
             {
-                const int expected = 2;
+                var expected = 2 * _fixture.HostedCluster.Silos.Count;
                 var grain = _fixture.GrainFactory.GetGrain<IOtherStatelessWorkerPlacementTestGrain>(Guid.NewGuid());
                 int actual = await ActivationCount(grain, expected * 50);
                 Assert.True(actual <= expected, $"Created more activations than the specified limit: {actual} > {expected}.");

test/TesterInternal/MessageScheduling/DisabledCallChainReentrancyTestRunner.cs

@@ -90,31 +90,5 @@ public void NonReentrantGrain_WithMayInterleaveInstancedPredicate_WhenPredicateR
             }
             this.logger.LogInformation("Reentrancy NonReentrantGrain_WithMayInterleaveInstancedPredicate_WhenPredicateReturnsFalse Test finished OK.");
         }
-
-        public void UnorderedNonReentrantGrain(bool performDeadlockDetection)
-        {
-            IUnorderedNonReentrantGrain unonreentrant = this.grainFactory.GetGrain<IUnorderedNonReentrantGrain>(OrleansTestingBase.GetRandomGrainId());
-            unonreentrant.SetSelf(unonreentrant).Wait();
-            bool timeout = false;
-            bool deadlock = false;
-            try
-            {
-                timeout = !unonreentrant.Two().Wait(2000);
-            }
-            catch (Exception exc)
-            {
-                Assert.Fail($"Unexpected exception {exc.Message}: {exc.StackTrace}");
-            }
-            if (performDeadlockDetection)
-            {
-                Assert.True(deadlock, "Non-reentrant grain should deadlock");
-            }
-            else
-            {
-                Assert.True(timeout, "Non-reentrant grain should timeout");
-            }
-
-            this.logger.LogInformation("Reentrancy UnorderedNonReentrantGrain Test finished OK.");
-        }
     }
 }

test/TesterInternal/MessageScheduling/DisabledCallChainReentrancyTests.cs

@@ -38,11 +38,5 @@ public void NonReentrantGrain_WithMayInterleaveInstancedPredicate_WhenPredicateR
         {
             this.runner.NonReentrantGrain_WithMayInterleaveInstancedPredicate_WhenPredicateReturnsFalse(false);
         }
-
-        [Fact, TestCategory("Functional"), TestCategory("Tasks"), TestCategory("Reentrancy")]
-        public void UnorderedNonReentrantGrain()
-        {
-            this.runner.UnorderedNonReentrantGrain(false);
-        }
     }
 }