- opt Blocking timeout error；#182

2881099 · Apr 24, 2024 · 5e67d55 · 5e67d55
1 parent e635ae7
commit 5e67d55
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/examples/console_net8_cluster/Program.cs b/examples/console_net8_cluster/Program.cs
@@ -26,6 +26,17 @@ class Program
 
         static void Main(string[] args)
         {
+            var tblv1 = cli.BLPop("testblist01", 5);
+            var tblv2 = cli.BLPop("testblist02", 5);
+            var tblv3 = cli.BLPop("testblist03", 5);
+
+            cli.LPush("testblist01", "value1");
+            tblv1 = cli.BLPop("testblist01", 5);
+            cli.LPush("testblist02", "value2");
+            tblv2 = cli.BLPop("testblist02", 5);
+            cli.LPush("testblist03", "value3");
+            tblv3 = cli.BLPop("testblist03", 5);
+
             //预热
             cli.Set(Guid.NewGuid().ToString(), "我也不知道为什么刚刚好十五个字");
             sedb.StringSet(Guid.NewGuid().ToString(), "我也不知道为什么刚刚好十五个字");

diff --git a/src/FreeRedis/CommandPacket.cs b/src/FreeRedis/CommandPacket.cs
@@ -204,6 +204,11 @@ internal bool IsReadOnlyCommand()
             var cmdset = CommandSets.Get(_command);
             return cmdset != null && ((cmdset.Tag & CommandSets.ServerTag.read) == CommandSets.ServerTag.read || (cmdset.Flag & CommandSets.ServerFlag.@readonly) == CommandSets.ServerFlag.@readonly);
         }
+        internal bool IsBlockingCommand()
+        {
+            var cmdset = CommandSets.Get(_command);
+            return cmdset != null && ((cmdset.Tag & CommandSets.ServerTag.blocking) == CommandSets.ServerTag.blocking);
+        }
     }
 
     static class CommandPacketExtensions

diff --git a/src/FreeRedis/RedisClient/Adapter/ClusterAdapter.cs b/src/FreeRedis/RedisClient/Adapter/ClusterAdapter.cs
@@ -144,7 +144,7 @@ public override TValue AdapterCall<TValue>(CommandPacket cmd, Func<RedisResult,
                         }
                         catch (Exception ex)
                         {
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                             }
                             throw;
@@ -242,7 +242,7 @@ async public override Task<TValue> AdapterCallAsync<TValue>(CommandPacket cmd, F
                         }
                         catch (Exception ex)
                         {
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                             }
                             throw;

diff --git a/src/FreeRedis/RedisClient/Adapter/NormanAdapter.cs b/src/FreeRedis/RedisClient/Adapter/NormanAdapter.cs
@@ -130,7 +130,7 @@ public override TValue AdapterCall<TValue>(CommandPacket cmd, Func<RedisResult,
                         catch (Exception ex)
                         {
                             var pool = (rds as DefaultRedisSocket.TempProxyRedisSocket)._pool;
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                             }
                             throw;
@@ -193,7 +193,7 @@ async public override Task<TValue> AdapterCallAsync<TValue>(CommandPacket cmd, F
                         catch (Exception ex)
                         {
                             var pool = (rds as DefaultRedisSocket.TempProxyRedisSocket)._pool;
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                             }
                             throw;

diff --git a/src/FreeRedis/RedisClient/Adapter/PoolingAdapter.cs b/src/FreeRedis/RedisClient/Adapter/PoolingAdapter.cs
@@ -95,7 +95,7 @@ public override TValue AdapterCall<TValue>(CommandPacket cmd, Func<RedisResult,
                         catch (Exception ex)
                         {
                             var pool = (rds as DefaultRedisSocket.TempProxyRedisSocket)._pool;
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                             }
                             throw;
@@ -136,7 +136,7 @@ public override Task<TValue> AdapterCallAsync<TValue>(CommandPacket cmd, Func<Re
                         catch (Exception ex)
                         {
                             var pool = (rds as DefaultRedisSocket.TempProxyRedisSocket)._pool;
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                             }
                             throw;

diff --git a/src/FreeRedis/RedisClient/Adapter/SentinelAdapter.cs b/src/FreeRedis/RedisClient/Adapter/SentinelAdapter.cs
@@ -134,7 +134,7 @@ public override TValue AdapterCall<TValue>(CommandPacket cmd, Func<RedisResult,
                         catch (Exception ex)
                         {
                             var pool = (rds as DefaultRedisSocket.TempProxyRedisSocket)._pool;
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                                 RecoverySentinel();
                             }
@@ -176,7 +176,7 @@ public override Task<TValue> AdapterCallAsync<TValue>(CommandPacket cmd, Func<Re
                         catch (Exception ex)
                         {
                             var pool = (rds as DefaultRedisSocket.TempProxyRedisSocket)._pool;
-                            if (pool?.SetUnavailable(ex, getTime) == true)
+                            if (cmd.IsBlockingCommand() == false && pool?.SetUnavailable(ex, getTime) == true)
                             {
                                 RecoverySentinel();
                             }