fix bug in Protocol.processBulkReply()

* if RedisInputStream().read() at Protocol.processBulkReply() returns
-1, it runs with unexpected behavior
* fix: check and if return value is -1, it throws
JedisConnectionException with message "server has closed the connection"
** prevent unexpected behavior, specially ArrayIndexOutOfBoundException 
*** calls System.arraycopy() with length = -1 (cause limit = -1) at
RedisInputStream.read()

add pubsub unit test scenario : client-output-buffer-limit exceed

* Redis warns event(disconnect client) to their log, and suddenly
disconnected connection
** http://redis.io/topics/clients -> Output buffers limits
** so test expects JedisConnectionException with proper message
This commit is contained in:
임정택
2013-10-16 18:22:04 +09:00
parent 597366343d
commit e9506298f8
3 changed files with 76 additions and 1 deletions

View File

@@ -528,4 +528,75 @@ public class PublishSubscribeCommandsTest extends JedisCommandTestBase {
};
pubsub.unsubscribe();
}
//@Test(expected = JedisConnectionException.class)
@Test
public void handleClientOutputBufferLimitForSubscribeTooSlow() throws InterruptedException {
final Thread t = new Thread(new Runnable() {
public void run() {
try {
Jedis j = createJedis();
Thread.sleep(1000);
// we already set jedis1 config to client-output-buffer-limit pubsub 256k 128k 5
// it means if subscriber delayed to receive over 256k or 128k continuously 5 sec,
// redis disconnects subscriber
// we publish over 10M data for making situation for exceed client-output-buffer-limit
String veryLargeString = makeLargeString(1024 * 10);
// 10K * 1024 = 10M
for (int i = 0 ; i < 1024 ; i++)
j.publish("foo", veryLargeString); // 1k
j.disconnect();
} catch (Exception ex) {
fail(ex.getMessage());
}
}
});
t.start();
jedis.subscribe(new JedisPubSub() {
public void onMessage(String channel, String message) {
try {
// wait 0.5 secs to slow down subscribe and client-output-buffer exceed
System.out.println("channel - " + channel + " / message - " + message);
Thread.sleep(500);
} catch (Exception e) {
try {
t.join();
} catch (InterruptedException e1) {
}
fail(e.getMessage());
}
}
public void onSubscribe(String channel, int subscribedChannels) {
}
public void onUnsubscribe(String channel, int subscribedChannels) {
}
public void onPSubscribe(String pattern, int subscribedChannels) {
}
public void onPUnsubscribe(String pattern, int subscribedChannels) {
}
public void onPMessage(String pattern, String channel,
String message) {
}
}, "foo");
t.join();
}
private String makeLargeString(int size) {
StringBuffer sb = new StringBuffer();
for (int i = 0 ; i < size ; i++)
sb.append((char)('a' + i % 26));
return sb.toString();
}
}