. (#1770)

asynkron · Sep 25, 2022 · dc7ec97 · dc7ec97
1 parent 260cc5f
commit dc7ec97
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 28 deletions.
diff --git a/src/Proto.Cluster.Identity.MongoDb/MongoIdentityStorage.cs b/src/Proto.Cluster.Identity.MongoDb/MongoIdentityStorage.cs
@@ -202,7 +202,7 @@ CancellationToken ct
             Logger.LogWarning(x, "Mongo connection failure, retrying");
         }
 
-        throw new StorageFailure($"Failed to connect to MongoDB while looking up key {key}");
+        throw new StorageFailureException($"Failed to connect to MongoDB while looking up key {key}");
     }
 
     private string GetKey(ClusterIdentity clusterIdentity) => $"{_clusterName}/{clusterIdentity}";

diff --git a/src/Proto.Cluster/DefaultClusterContext.cs b/src/Proto.Cluster/DefaultClusterContext.cs
@@ -311,7 +311,7 @@ private async ValueTask RemoveFromSource(ClusterIdentity clusterIdentity, PidSou
                 return pid;
             }
         }
-        catch (Exception e) when (e is not IdentityIsBlocked)
+        catch (Exception e) when (e is not IdentityIsBlockedException)
         {
             e.CheckFailFast();
 

diff --git a/src/Proto.Cluster/Gossip/GossipStateManagement.cs b/src/Proto.Cluster/Gossip/GossipStateManagement.cs
@@ -146,7 +146,7 @@ Func<T, TV> extractValue
         {
             logger?.LogDebug("No members found for consensus check");
 
-            return (false, default);
+            return (false, default!);
         }
 
         logger?.LogDebug("Checking consensus");
@@ -155,7 +155,7 @@ Func<T, TV> extractValue
         {
             logger?.LogDebug("I can't find myself");
 
-            return (false, default);
+            return (false, default!);
         }
 
         var ownValue = GetConsensusValue(ownMemberState);
@@ -164,7 +164,7 @@ Func<T, TV> extractValue
         {
             logger?.LogDebug("I don't have any value for {Key}", valueKey);
 
-            return (false, default);
+            return (false, default!);
         }
 
         foreach (var (memberId, memberState) in state.Members)
@@ -181,7 +181,7 @@ Func<T, TV> extractValue
 
             if (consensusValue is null || !ownValue.Equals(consensusValue))
             {
-                return (false, default);
+                return (false, default!);
             }
         }
 

diff --git a/src/Proto.Cluster/Gossip/Gossiper.cs b/src/Proto.Cluster/Gossip/Gossiper.cs
@@ -336,7 +336,7 @@ public ConsensusCheckBuilder<T> InConsensusWith<TE>(string key, Func<TE, T> getV
                 var (member, state) = kv;
                 var value = state.Values.TryGetValue(key, out var any) ? unpack(any.Value) : default;
 
-                return (member, key, value);
+                return (member, key, value!);
             };
         }
 
@@ -371,7 +371,7 @@ private ConsensusCheck<T> Build()
                         );
                     }
 
-                    return result;
+                    return result!;
                 };
             }
 
@@ -403,7 +403,7 @@ private ConsensusCheck<T> Build()
                 }
 
                 // ReSharper enable PossibleMultipleEnumeration
-                return consensus;
+                return consensus!;
             };
 
             KeyValuePair<string, GossipState.Types.GossipMemberState>[] GetValidMemberStates(GossipState state,

diff --git a/src/Proto.Cluster/Identity/IIdentityStorage.cs b/src/Proto.Cluster/Identity/IIdentityStorage.cs
@@ -137,18 +137,22 @@ public StoredActivation(string memberId, PID pid)
     public string MemberId { get; }
 }
 
-public class StorageFailure : Exception
+#pragma warning disable RCS1194
+public class StorageFailureException : Exception
+#pragma warning restore RCS1194
 {
-    public StorageFailure(string message) : base(message)
+    public StorageFailureException(string message) : base(message)
     {
     }
 
-    public StorageFailure(string message, Exception innerException) : base(message, innerException)
+    public StorageFailureException(string message, Exception innerException) : base(message, innerException)
     {
     }
 }
 
-public class LockNotFoundException : StorageFailure
+#pragma warning disable RCS1194
+public class LockNotFoundException : StorageFailureException
+#pragma warning restore RCS1194
 {
     public LockNotFoundException(string message) : base(message)
     {

diff --git a/...oto.Cluster/Identity/IdentityIsBlocked.cs → ...er/Identity/IdentityIsBlockedException.cs b/...oto.Cluster/Identity/IdentityIsBlocked.cs → ...er/Identity/IdentityIsBlockedException.cs
@@ -11,9 +11,11 @@ namespace Proto.Cluster.Identity;
 /// <summary>
 ///     Lets the caller know that the identity is not available to spawn.
 /// </summary>
-public class IdentityIsBlocked : Exception
+#pragma warning disable RCS1194
+public class IdentityIsBlockedException : Exception
+#pragma warning restore RCS1194
 {
-    public IdentityIsBlocked(ClusterIdentity blockedIdentity)
+    public IdentityIsBlockedException(ClusterIdentity blockedIdentity)
     {
         BlockedIdentity = blockedIdentity;
     }

diff --git a/src/Proto.Cluster/Identity/IdentityStorageLookup.cs b/src/Proto.Cluster/Identity/IdentityStorageLookup.cs
@@ -34,7 +34,7 @@ public IdentityStorageLookup(IIdentityStorage storage)
 
         if (res?.IdentityBlocked == true)
         {
-            throw new IdentityIsBlocked(clusterIdentity);
+            throw new IdentityIsBlockedException(clusterIdentity);
         }
 
         return res?.Pid;

diff --git a/src/Proto.Cluster/Identity/IdentityStorageWorker.cs b/src/Proto.Cluster/Identity/IdentityStorageWorker.cs
@@ -149,7 +149,7 @@ async Task<PidResult> Inner()
 
                     if (activator == null)
                     {
-                        return null;
+                        return null!;
                     }
 
                     //try to acquire global lock
@@ -178,7 +178,7 @@ async Task<PidResult> Inner()
                 {
                     if (_cluster.System.Shutdown.IsCancellationRequested)
                     {
-                        return null;
+                        return null!;
                     }
 
                     if (_shouldThrottle().IsOpen())
@@ -192,7 +192,7 @@ async Task<PidResult> Inner()
                 {
                     if (_cluster.System.Shutdown.IsCancellationRequested)
                     {
-                        return null;
+                        return null!;
                     }
 
                     if (_shouldThrottle().IsOpen())

diff --git a/src/Proto.Cluster/LegacyClusterContext.cs b/src/Proto.Cluster/LegacyClusterContext.cs
@@ -206,7 +206,7 @@ private async ValueTask RemoveFromSource(ClusterIdentity clusterIdentity, PidSou
                 return pid;
             }
         }
-        catch (Exception e) when (e is not IdentityIsBlocked)
+        catch (Exception e) when (e is not IdentityIsBlockedException)
         {
             e.CheckFailFast();
 

diff --git a/src/Proto.Cluster/Partition/PartitionIdentityLookup.cs b/src/Proto.Cluster/Partition/PartitionIdentityLookup.cs
@@ -117,7 +117,7 @@ public PartitionIdentityLookup(PartitionConfig? config)
 
             if (resp?.InvalidIdentity == true)
             {
-                throw new IdentityIsBlocked(clusterIdentity);
+                throw new IdentityIsBlockedException(clusterIdentity);
             }
 
             if (_config.DeveloperLogging)
@@ -167,7 +167,7 @@ public PartitionIdentityLookup(PartitionConfig? config)
 
             return null;
         }
-        catch (Exception e) when (e is not IdentityIsBlocked)
+        catch (Exception e) when (e is not IdentityIsBlockedException)
         {
             e.CheckFailFast();
 

diff --git a/src/Proto.Cluster/PartitionActivator/PartitionActivatorLookup.cs b/src/Proto.Cluster/PartitionActivator/PartitionActivatorLookup.cs
@@ -69,7 +69,7 @@ public PartitionActivatorLookup(TimeSpan getPidTimeout)
 
             if (resp.InvalidIdentity)
             {
-                throw new IdentityIsBlocked(clusterIdentity);
+                throw new IdentityIsBlockedException(clusterIdentity);
             }
 
             return resp?.Pid;
@@ -89,7 +89,7 @@ public PartitionActivatorLookup(TimeSpan getPidTimeout)
 
             return null;
         }
-        catch (Exception e) when (e is not IdentityIsBlocked)
+        catch (Exception e) when (e is not IdentityIsBlockedException)
         {
             e.CheckFailFast();
 

diff --git a/src/Proto.Cluster/PubSub/BatchingProducer.cs b/src/Proto.Cluster/PubSub/BatchingProducer.cs
@@ -328,7 +328,9 @@ private class PubSubBatchWithReceipts
     }
 }
 
+#pragma warning disable RCS1194
 public class ProducerQueueFullException : Exception
+#pragma warning restore RCS1194
 {
     public ProducerQueueFullException(string topic) : base($"Producer for topic {topic} has full queue")
     {

diff --git a/src/Proto.Cluster/SingleNode/SingleNodeLookup.cs b/src/Proto.Cluster/SingleNode/SingleNodeLookup.cs
@@ -50,7 +50,7 @@ public SingleNodeLookup(TimeSpan getPidTimeout)
 
             if (resp.InvalidIdentity)
             {
-                throw new IdentityIsBlocked(clusterIdentity);
+                throw new IdentityIsBlockedException(clusterIdentity);
             }
 
             return resp?.Pid;
@@ -67,7 +67,7 @@ public SingleNodeLookup(TimeSpan getPidTimeout)
 
             return null;
         }
-        catch (Exception e) when (e is not IdentityIsBlocked)
+        catch (Exception e) when (e is not IdentityIsBlockedException)
         {
             e.CheckFailFast();
             Logger.LogError(e, "[SingleNode] Error occured requesting remote PID {@Request}", req);

diff --git a/tests/Proto.Cluster.RedisIdentity.Tests/RedisIdentityTests.cs b/tests/Proto.Cluster.RedisIdentity.Tests/RedisIdentityTests.cs
@@ -73,7 +73,7 @@ ChaosMonkeyRedisIdentityClusterFixture clusterFixture
 internal static class RedisFixture
 {
     private static readonly Lazy<ConnectionMultiplexer> LazyConnection = new(()
-        => ConnectionMultiplexer.Connect(TestConfig.Configuration.GetConnectionString("Redis")));
+        => ConnectionMultiplexer.Connect(TestConfig.Configuration.GetConnectionString("Redis")!));
 
     static RedisFixture()
     {

diff --git a/tests/Proto.Cluster.Tests/ClusterTests.cs b/tests/Proto.Cluster.Tests/ClusterTests.cs
@@ -371,7 +371,7 @@ await Tracing.Trace(async () =>
 
                 await member.Invoking(async m => await m.RequestAsync<Pong>(invalidIdentity, message, timeout))
                     .Should()
-                    .ThrowExactlyAsync<IdentityIsBlocked>();
+                    .ThrowExactlyAsync<IdentityIsBlockedException>();
             }, _testOutputHelper
         );