GEODE-8459: Redis API for Geode handles errors when member disconnects (

apache#5481)
isabella232 · Aug 26, 2020 · cecf003 · cecf003
1 parent 6ca548f
commit cecf003
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
@@ -31,9 +31,11 @@
 import io.netty.handler.codec.DecoderException;
 import org.apache.logging.log4j.Logger;
 
+import org.apache.geode.ForcedDisconnectException;
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.execute.FunctionException;
 import org.apache.geode.cache.execute.FunctionInvocationTargetException;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.redis.internal.GeodeRedisServer;
 import org.apache.geode.redis.internal.ParameterRequirements.RedisParametersMismatchException;
@@ -167,8 +169,10 @@ private RedisResponse getExceptionResponse(ChannelHandlerContext ctx, Throwable
     } else if (cause instanceof IllegalStateException
         || cause instanceof RedisParametersMismatchException) {
       response = RedisResponse.error(cause.getMessage());
-    } else if (cause instanceof FunctionInvocationTargetException) {
-      // This indicates a member departed
+    } else if (cause instanceof FunctionInvocationTargetException
+        || cause instanceof DistributedSystemDisconnectedException
+        || cause instanceof ForcedDisconnectException) {
+      // This indicates a member departed or got disconnected
       logger.warn(
           "Closing client connection because one of the servers doing this operation departed.");
       channelInactive(ctx);