Merge pull request #6970 from bandalgomsu/gh-6944

mrniko · web-flow · commit 3109c3b6e800 · 2026-02-04T09:19:15.000+03:00
Fix CommandDecoder to handle BUSY error prefix
diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
@@ -419,7 +419,7 @@ protected void decode(ByteBuf in, CommandData<Object, Object> data, List<Object>
             } else if (error.startsWith("MASTERDOWN")) {
                 data.tryFailure(new RedisMasterDownException(error
                         + ". channel: " + channel + " data: " + data));
-            } else if (error.startsWith("BUSY")) {
+            } else if (error.startsWith("BUSY ")) {
                 data.tryFailure(new RedisBusyException(error
                         + ". channel: " + channel + " data: " + data));
             } else if (error.startsWith("WAIT") || error.startsWith("ERR WAIT")) {
diff --git a/redisson/src/test/java/org/redisson/RedissonStreamTest.java b/redisson/src/test/java/org/redisson/RedissonStreamTest.java
@@ -6,6 +6,7 @@
 import org.redisson.api.*;
 import org.redisson.api.listener.StreamAddListener;
 import org.redisson.api.stream.*;
+import org.redisson.client.RedisBusyException;
 import org.redisson.client.RedisException;
 import org.redisson.client.protocol.StreamEntryStatus;
 
@@ -64,6 +65,19 @@ public void testEmptyMap() {
         assertThat(result).hasSize(1);
     }
 
+    @Test
+    public void testBusyGroupIsNotRetryException() {
+        RStream<String, String> stream = redisson.getStream("test");
+        stream.createGroup(StreamCreateGroupArgs.name("group").makeStream());
+
+        RedisException ex = Assertions.assertThrows(RedisException.class, () -> {
+            stream.createGroup(StreamCreateGroupArgs.name("group").makeStream());
+        });
+
+        assertThat(ex).isNotInstanceOf(RedisBusyException.class);
+        assertThat(ex.getMessage()).startsWith("BUSYGROUP");
+    }
+
     @Test
     public void testAutoClaim() throws InterruptedException {
         RStream<String, String> stream = redisson.getStream("test");
