Minor improvements to Service Fabric providers (#3250)

* Minor Service Fabric provider fixes and tweaks

* Additional logging in SF gateway provider

* FabricMembershipOracle reduce polling interval from 30s to 5s

* review feedback

src/OrleansServiceFabricUtils/FabricGatewayProvider.cs

@@ -41,8 +41,8 @@ internal class FabricGatewayProvider : IGatewayListProvider, IGatewayListObserva
         public FabricGatewayProvider(IFabricServiceSiloResolver siloResolver)
         {
             this.fabricServiceSiloResolver = siloResolver;
-            this.refreshPeriod = TimeSpan.FromSeconds(30);
-            this.MaxStaleness = TimeSpan.FromSeconds(this.refreshPeriod.TotalSeconds * 2);
+            this.refreshPeriod = TimeSpan.FromSeconds(5);
+            this.MaxStaleness = this.refreshPeriod;
         }
 
         /// <inheritdoc />
@@ -67,14 +67,16 @@ public async Task InitializeGatewayListProvider(ClientConfiguration clientConfig
         /// <inheritdoc />
         public bool SubscribeToGatewayNotificationEvents(IGatewayListListener subscriber)
         {
+            this.log.Verbose($"Subscribing {subscriber} to gateway notification events.");
             this.subscribers.TryAdd(subscriber, subscriber);
             return true;
         }
 
         /// <inheritdoc />
-        public bool UnSubscribeFromGatewayNotificationEvents(IGatewayListListener listener)
+        public bool UnSubscribeFromGatewayNotificationEvents(IGatewayListListener subscriber)
         {
-            this.subscribers.TryRemove(listener, out listener);
+            this.log.Verbose($"Unsubscribing {subscriber} from gateway notification events.");
+            this.subscribers.TryRemove(subscriber, out subscriber);
             return true;
         }
 

src/OrleansServiceFabricUtils/FabricMembershipOracle.cs

@@ -21,7 +21,7 @@ internal class FabricMembershipOracle : IMembershipOracle, IFabricServiceStatusL
 
         private readonly AutoResetEvent notificationEvent = new AutoResetEvent(false);
         private readonly BlockingCollection<StatusChangeNotification> notifications = new BlockingCollection<StatusChangeNotification>();
-        private readonly TimeSpan refreshPeriod = TimeSpan.FromSeconds(30);
+        private readonly TimeSpan refreshPeriod = TimeSpan.FromSeconds(5);
         private readonly ILocalSiloDetails localSiloDetails;
         private readonly GlobalConfiguration globalConfig;
         private readonly IFabricServiceSiloResolver fabricServiceSiloResolver;

src/OrleansServiceFabricUtils/FabricServiceSiloResolver.cs

@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Fabric;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -132,14 +133,6 @@ private void OnPartitionChange(long handlerId, FabricPartitionResolutionChange a
                     if (!existing.IsSamePartitionAs(updated.Partition)) continue;
                     found = true;
 
-                    if (updated.Partition.IsOlderThan(existing))
-                    {
-                        this.log.Info($"Update for partition {updated} is superseded by existing version.");
-
-                        // Do not update the partition if the exiting one has a newer version than the update.
-                        break;
-                    }
-
                     // Update the partition.
                     this.silos[i] = updated;
                     this.NotifySubscribers();

src/OrleansServiceFabricUtils/Models/IResolvedServicePartition.cs

@@ -14,9 +14,7 @@ internal interface IResolvedServicePartition
         Guid Id { get; }
 
         ServicePartitionKind Kind { get; }
-
-        bool IsOlderThan(IResolvedServicePartition other);
-
+
         bool IsSamePartitionAs(IResolvedServicePartition other);
     }
 }

src/OrleansServiceFabricUtils/Utilities/FabricQueryManager.cs

@@ -155,14 +155,6 @@ public ResolvedServicePartitionWrapper(ResolvedServicePartition partition)
 
             public ServicePartitionKind Kind => this.Partition.Info.Kind;
 
-            public bool IsOlderThan(IResolvedServicePartition other)
-            {
-                var otherWrapper = other as ResolvedServicePartitionWrapper;
-                if (otherWrapper == null) return false;
-
-                return this.Partition.IsOlderThan(otherWrapper.Partition);
-            }
-
             public bool IsSamePartitionAs(IResolvedServicePartition other)
             {
                 var otherWrapper = other as ResolvedServicePartitionWrapper;

src/OrleansServiceFabricUtils/Utilities/ResolvedServicePartitionExtensions.cs

@@ -14,8 +14,10 @@ internal static class ResolvedServicePartitionExtensions
         /// <returns>The active endpoints published by the specified partition.</returns>
         public static List<FabricSiloInfo> GetPartitionEndpoints(this ResolvedServicePartition partition)
         {
-            var results = new List<FabricSiloInfo>(partition.Endpoints.Count);
-            foreach (var silo in partition.Endpoints)
+            var resolvedServiceEndpoints = partition.Endpoints;
+            if (resolvedServiceEndpoints == null) return new List<FabricSiloInfo>();
+            var results = new List<FabricSiloInfo>(resolvedServiceEndpoints.Count);
+            foreach (var silo in resolvedServiceEndpoints)
             {
                 // Find the primary endpoint. If this is a stateless service, find any endpoint.
                 if (silo.Role != ServiceEndpointRole.Stateless && silo.Role != ServiceEndpointRole.StatefulPrimary) continue;
@@ -30,7 +32,7 @@ public static List<FabricSiloInfo> GetPartitionEndpoints(this ResolvedServicePar
         }
 
         /// <summary>
-        /// Respresents endpoints returned from <see cref="ResolvedServiceEndpoint.Address"/> in JSON form.
+        /// Represents endpoints returned from <see cref="ResolvedServiceEndpoint.Address"/> in JSON form.
         /// </summary>
         internal class ServicePartitionEndpoints
         {

src/OrleansServiceFabricUtils/Utilities/ServiceFabricExtensions.cs

@@ -6,19 +6,6 @@ namespace Microsoft.Orleans.ServiceFabric.Utilities
 {
     internal static class ServiceFabricExtensions
     {
-        /// <summary>
-        /// Returns a value indicating whether or not <paramref name="left"/> is older than <paramref name="right"/>.
-        /// </summary>
-        /// <param name="left">One resolved partition.</param>
-        /// <param name="right">The other resolved partition.</param>
-        /// <returns>
-        /// <see langword="true"/> if <paramref name="left"/> is older than <paramref name="right"/>, <see langword="false"/> otherwise.
-        /// </returns>
-        public static bool IsOlderThan(this ResolvedServicePartition left, ResolvedServicePartition right)
-        {
-            return left.Info.Id == right.Info.Id && left.CompareVersion(right) < 0;
-        }
-
         /// <summary>
         /// Returns a value indicating whether or not <paramref name="left"/> is the same partition as <paramref name="right"/>.
         /// </summary>