GEODE-8222: Also ignore EntryDestroyedException during passive expira…

…tion (apache#5239) Authored-by: Jens Deppe <[email protected]>
shjgiser · Jun 11, 2020 · 4a0eeeb · 4a0eeeb
1 parent 3897ab1
commit 4a0eeeb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
@@ -54,6 +54,7 @@
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.EntryDestroyedException;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.partition.PartitionRegionHelper;
@@ -394,7 +395,7 @@ private void doDataExpiration(
           redisKeyCommands.pttl(entry.getKey());
         }
       }
-    } catch (CacheClosedException ignore) {
+    } catch (CacheClosedException | EntryDestroyedException ignore) {
     } catch (RuntimeException | Error ex) {
       logger.warn("Passive Redis expiration failed. Will try again in 1 second.", ex);
     }