diff --git a/redisson/src/main/java/org/redisson/client/RedisClusterDownException.java b/redisson/src/main/java/org/redisson/client/RedisClusterDownException.java new file mode 100644 index 000000000..69b633611 --- /dev/null +++ b/redisson/src/main/java/org/redisson/client/RedisClusterDownException.java @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2013-2020 Nikita Koksharov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.redisson.client; + +/** + * This error occurs when Redis Cluster is down. + * + * @author Nikita Koksharov + * + */ +public class RedisClusterDownException extends RedisException { + + private static final long serialVersionUID = -2565335188503354660L; + + public RedisClusterDownException(String message) { + super(message); + } + +} diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java index f2841d94f..99d72ac2a 100644 --- a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java +++ b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java @@ -357,6 +357,9 @@ public class CommandDecoder extends ReplayingDecoder { } else if (error.startsWith("NOAUTH")) { data.tryFailure(new RedisAuthRequiredException(error + ". channel: " + channel + " data: " + data)); + } else if (error.startsWith("CLUSTERDOWN")) { + data.tryFailure(new RedisClusterDownException(error + + ". channel: " + channel + " data: " + data)); } else { if (data != null) { data.tryFailure(new RedisException(error + ". channel: " + channel + " command: " + LogHelper.toString(data))); diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java index 687b0dd06..2fd99572d 100644 --- a/redisson/src/main/java/org/redisson/command/RedisExecutor.java +++ b/redisson/src/main/java/org/redisson/command/RedisExecutor.java @@ -426,7 +426,8 @@ public class RedisExecutor { } if (attemptFuture.cause() instanceof RedisLoadingException - || attemptFuture.cause() instanceof RedisTryAgainException) { + || attemptFuture.cause() instanceof RedisTryAgainException + || attemptFuture.cause() instanceof RedisClusterDownException) { if (attempt < attempts) { onException(); connectionManager.newTimeout(new TimerTask() {