GEODE-669

Add CacheObserver for ShutdownAll Let GatewayReceiverCommand to throw CacheClosedException instead of RegionDestroyedException when ShutdownAll happened.
ihoney · Dec 15, 2015 · ae2d529 · ae2d529
1 parent 0b288a2
commit ae2d529
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java
@@ -183,4 +183,9 @@ public interface CacheObserver
    */
   public void beforeDeletingEmptyOplog(Oplog emptyOplog);
 
+  /**
+   * Invoked just before ShutdownAll operation
+   * @param emptyOplog
+   */
+  void beforeShutdownAll();
 }
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserverAdapter.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserverAdapter.java
@@ -147,4 +147,8 @@ public void beforeDeletingCompactedOplog(Oplog compactedOplog)
   public void beforeDeletingEmptyOplog(Oplog emptyOplog)
   {
   }
+
+  @Override
+  public void beforeShutdownAll() {
+  }
 }
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -1639,6 +1639,13 @@ public synchronized void shutDownAll() {
       // it's already doing shutdown by another thread
       return;
     }
+    if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+      try {
+        CacheObserverHolder.getInstance().beforeShutdownAll();
+      } finally {
+        LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
+      }
+    }
     this.isShutDownAll = true;
 
     // bug 44031 requires multithread shutdownall should be grouped

diff --git a/...java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/...java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.EntryNotFoundException;
 import com.gemstone.gemfire.cache.RegionDestroyedException;
 import com.gemstone.gemfire.cache.operations.DestroyOperationContext;
@@ -36,6 +37,7 @@
 import com.gemstone.gemfire.internal.Version;
 import com.gemstone.gemfire.internal.cache.EntryEventImpl;
 import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.KeyWithRegionContext;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
@@ -67,6 +69,16 @@ public static Command getCommand() {
   private GatewayReceiverCommand() {
   }
 
+  private void handleRegionNull(ServerConnection servConn, String regionName, int batchId) {
+    GemFireCacheImpl gfc = (GemFireCacheImpl)servConn.getCachedRegionHelper().getCache();
+    if (gfc != null && gfc.isCacheAtShutdownAll()) {
+      throw new CacheClosedException("Shutdown occurred during message processing");
+    } else {
+      String reason = LocalizedStrings.ProcessBatch_WAS_NOT_FOUND_DURING_BATCH_CREATE_REQUEST_0.toLocalizedString(new Object[] {regionName, Integer.valueOf(batchId)});
+      throw new RegionDestroyedException(reason, regionName);
+    }
+  }
+
   @Override
   public void cmdExecute(Message msg, ServerConnection servConn, long start)
       throws IOException, InterruptedException {
@@ -292,8 +304,7 @@ public void cmdExecute(Message msg, ServerConnection servConn, long start)
           }
           region = (LocalRegion)crHelper.getRegion(regionName);
           if (region == null) {
-            String reason = LocalizedStrings.ProcessBatch_WAS_NOT_FOUND_DURING_BATCH_CREATE_REQUEST_0.toLocalizedString(new Object[] {regionName, Integer.valueOf(batchId)});
-            throw new RegionDestroyedException(reason, regionName);
+            handleRegionNull(servConn, regionName, batchId);
           } else {
             clientEvent = new EntryEventImpl(eventId);
             if (versionTimeStamp > 0) {
@@ -402,8 +413,7 @@ public void cmdExecute(Message msg, ServerConnection servConn, long start)
           }
           region = (LocalRegion)crHelper.getRegion(regionName);
           if (region == null) {
-            String reason = LocalizedStrings.ProcessBatch_WAS_NOT_FOUND_DURING_BATCH_CREATE_REQUEST_0.toLocalizedString(new Object[] {regionName, Integer.valueOf(batchId)});
-            throw new RegionDestroyedException(reason, regionName);
+            handleRegionNull(servConn, regionName, batchId);
           } else {
             clientEvent = new EntryEventImpl(eventId);
             if (versionTimeStamp > 0) {
@@ -502,8 +512,7 @@ public void cmdExecute(Message msg, ServerConnection servConn, long start)
           }
           region = (LocalRegion)crHelper.getRegion(regionName);
           if (region == null) {
-            String reason = LocalizedStrings.ProcessBatch_WAS_NOT_FOUND_DURING_BATCH_CREATE_REQUEST_0.toLocalizedString(new Object[] {regionName, Integer.valueOf(batchId)});
-            throw new RegionDestroyedException(reason, regionName);
+            handleRegionNull(servConn, regionName, batchId);
           } else {
             clientEvent = new EntryEventImpl(eventId);
             if (versionTimeStamp > 0) {
@@ -584,8 +593,7 @@ public void cmdExecute(Message msg, ServerConnection servConn, long start)
             region = (LocalRegion)crHelper.getRegion(regionName);
 
             if (region == null) {
-              String reason = LocalizedStrings.ProcessBatch_WAS_NOT_FOUND_DURING_BATCH_UPDATE_VERSION_REQUEST_0.toLocalizedString(new Object[] {regionName});
-              throw new RegionDestroyedException(reason, regionName);
+              handleRegionNull(servConn, regionName, batchId);
             } else {
 
               clientEvent = new EntryEventImpl(eventId);