PubSub message decoding under heavy load fixed. #276

src/main/java/org/redisson/client/handler/CommandDecoder.java

@@ -110,6 +110,17 @@ public class CommandDecoder extends ReplayingDecoder<State> {
         } else if (data instanceof CommandsData) {
             CommandsData commands = (CommandsData)data;
 
+            handleCommandsDataResponse(ctx, in, data, currentDecoder, commands);
+            return;
+        }
+
+        ctx.pipeline().get(CommandsQueue.class).sendNextCommand(ctx);
+
+        state(null);
+    }
+
+    private void handleCommandsDataResponse(ChannelHandlerContext ctx, ByteBuf in, QueueCommand data,
+            Decoder<Object> currentDecoder, CommandsData commands) throws Exception {
         int i = state().getIndex();
 
         while (in.writerIndex() > in.readerIndex()) {
@@ -138,12 +149,6 @@ public class CommandDecoder extends ReplayingDecoder<State> {
             checkpoint();
             state().setIndex(i);
         }
-            return;
-        }
-
-        ctx.pipeline().get(CommandsQueue.class).sendNextCommand(ctx);
-
-        state(null);
     }
 
     private void decode(ByteBuf in, CommandData<Object, Object> data, List<Object> parts, Channel channel, Decoder<Object> currentDecoder) throws IOException {
@@ -206,6 +211,9 @@ public class CommandDecoder extends ReplayingDecoder<State> {
 
         Object result = decoder.decode(respParts, state());
 
+        // store current message index
+        checkpoint();
+
         if (result instanceof Message) {
             handleMultiResult(data, null, channel, result);
             // has next messages?

src/test/java/org/redisson/RedissonTopicTest.java

@@ -203,6 +203,8 @@ public class RedissonTopicTest {
         redisson2.shutdown();
     }
 
+    volatile long counter;
+
     @Test
     public void testHeavyLoad() throws InterruptedException {
         final CountDownLatch messageRecieved = new CountDownLatch(1000);
@@ -214,6 +216,7 @@ public class RedissonTopicTest {
             public void onMessage(String channel, Message msg) {
                 Assert.assertEquals(new Message("123"), msg);
                 messageRecieved.countDown();
+                counter++;
             }
         });
 
@@ -233,11 +236,13 @@ public class RedissonTopicTest {
 
         messageRecieved.await();
 
+        Thread.sleep(1000);
+
+        Assert.assertEquals(500, counter);
+
         redisson1.shutdown();
         redisson2.shutdown();
     }
-
-
     @Test
     public void testListenerRemove() throws InterruptedException {
         Redisson redisson1 = BaseTest.createInstance();