github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed - "response has been skipped due to timeout" warnings were removed. #3107

Browse Source
pull/3118/head
Nikita Koksharov 4 years ago
parent e48908ce6b
commit d58ee9acdb
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File

38
redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
Unescape Escape View File

@ -204,7 +204,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
} else if (data instanceof CommandsData) { } else if (data instanceof CommandsData) {
CommandsData commands = (CommandsData) data; CommandsData commands = (CommandsData) data;
try { try {
decodeCommandBatch(channel, in, data, commands); decodeCommandBatch(channel, in, commands);
} catch (Exception e) { } catch (Exception e) {
commands.getPromise().tryFailure(e); commands.getPromise().tryFailure(e);
sendNext(channel); sendNext(channel);
@ -232,8 +232,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
state(null); state(null);
} }
private void decodeCommandBatch(Channel channel, ByteBuf in, QueueCommand data, private void decodeCommandBatch(Channel channel, ByteBuf in, CommandsData commandBatch) throws Exception {
CommandsData commandBatch) throws Exception {
int i = state().getBatchIndex(); int i = state().getBatchIndex();
Throwable error = null; Throwable error = null;
@ -265,8 +264,9 @@ public class CommandDecoder extends ReplayingDecoder<State> {
decode(in, commandData, null, channel, skipConvertor, commandsData); decode(in, commandData, null, channel, skipConvertor, commandsData);
if (commandData != null && RedisCommands.EXEC.getName().equals(commandData.getCommand().getName()) if (commandData != null
&& commandData.getPromise().isSuccess()) { && RedisCommands.EXEC.getName().equals(commandData.getCommand().getName())
&& commandData.getPromise().isSuccess()) {
List<Object> objects = (List<Object>) commandData.getPromise().getNow(); List<Object> objects = (List<Object>) commandData.getPromise().getNow();
Iterator<Object> iter = objects.iterator(); Iterator<Object> iter = objects.iterator();
boolean multiFound = false; boolean multiFound = false;
@ -277,7 +277,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
} }
Object res = iter.next(); Object res = iter.next();
completeResponse((CommandData<Object, Object>) command, res, channel); completeResponse((CommandData<Object, Object>) command, res);
} }
if (RedisCommands.MULTI.getName().equals(command.getCommand().getName())) { if (RedisCommands.MULTI.getName().equals(command.getCommand().getName())) {
@ -307,13 +307,9 @@ public class CommandDecoder extends ReplayingDecoder<State> {
if (commandBatch.isSkipResult() || i == commandBatch.getCommands().size()) { if (commandBatch.isSkipResult() || i == commandBatch.getCommands().size()) {
RPromise<Void> promise = commandBatch.getPromise(); RPromise<Void> promise = commandBatch.getPromise();
if (error != null) { if (error != null) {
if (!promise.tryFailure(error) && promise.cause() instanceof RedisTimeoutException) { promise.tryFailure(error);
log.warn("response has been skipped due to timeout! channel: {}, command: {}", channel, LogHelper.toString(data));
}
} else { } else {
if (!promise.trySuccess(null) && promise.cause() instanceof RedisTimeoutException) { promise.trySuccess(null);
log.warn("response has been skipped due to timeout! channel: {}, command: {}", channel, LogHelper.toString(data));
}
} }
sendNext(channel); sendNext(channel);
@ -328,7 +324,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
if (code == '+') { if (code == '+') {
String result = readString(in); String result = readString(in);
handleResult(data, parts, result, skipConvertor, channel); handleResult(data, parts, result, skipConvertor);
} else if (code == '-') { } else if (code == '-') {
String error = readString(in); String error = readString(in);
@ -369,7 +365,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
} }
} else if (code == ':') { } else if (code == ':') {
Long result = readLong(in); Long result = readLong(in);
handleResult(data, parts, result, false, channel); handleResult(data, parts, result, false);
} else if (code == '$') { } else if (code == '$') {
ByteBuf buf = readBytes(in); ByteBuf buf = readBytes(in);
Object result = null; Object result = null;
@ -377,7 +373,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
Decoder<Object> decoder = selectDecoder(data, parts); Decoder<Object> decoder = selectDecoder(data, parts);
result = decoder.decode(buf, state()); result = decoder.decode(buf, state());
} }
handleResult(data, parts, result, false, channel); handleResult(data, parts, result, false);
} else if (code == '*') { } else if (code == '*') {
long size = readLong(in); long size = readLong(in);
List<Object> respParts = new ArrayList<Object>(Math.max((int) size, 0)); List<Object> respParts = new ArrayList<Object>(Math.max((int) size, 0));
@ -435,24 +431,24 @@ public class CommandDecoder extends ReplayingDecoder<State> {
protected void decodeResult(CommandData<Object, Object> data, List<Object> parts, Channel channel, protected void decodeResult(CommandData<Object, Object> data, List<Object> parts, Channel channel,
Object result) throws IOException { Object result) throws IOException {
if (data != null) { if (data != null) {
handleResult(data, parts, result, true, channel); handleResult(data, parts, result, true);
} }
} }
private void handleResult(CommandData<Object, Object> data, List<Object> parts, Object result, boolean skipConvertor, Channel channel) { private void handleResult(CommandData<Object, Object> data, List<Object> parts, Object result, boolean skipConvertor) {
if (data != null && !skipConvertor) { if (data != null && !skipConvertor) {
result = data.getCommand().getConvertor().convert(result); result = data.getCommand().getConvertor().convert(result);
} }
if (parts != null) { if (parts != null) {
parts.add(result); parts.add(result);
} else { } else {
completeResponse(data, result, channel); completeResponse(data, result);
} }
} }
protected void completeResponse(CommandData<Object, Object> data, Object result, Channel channel) { protected void completeResponse(CommandData<Object, Object> data, Object result) {
if (data != null && !data.getPromise().trySuccess(result) && data.cause() instanceof RedisTimeoutException) { if (data != null) {
log.warn("response has been skipped due to timeout! channel: {}, command: {}", channel, LogHelper.toString(data)); data.getPromise().trySuccess(result);
} }
} }

Write Preview
Loading…
Cancel
Save