[geode] 01/01: GEODE-7537: Remove the synchronization lock in CacheFactory.getAnyInstance

[es...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eshu11 pushed a commit to branch feature/GEODE-7537
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 509fcbb1ffd9d7f67154b82488df8e410fa2eeb9
Author: Eric Shu <es...@EricMacBookPro.local>
AuthorDate: Thu Dec 5 16:11:42 2019 -0800

    GEODE-7537: Remove the synchronization lock in CacheFactory.getAnyInstance
---
 .../geode/internal/cache/CacheFactoryStatics.java  | 16 +++--
 ...aySenderQueueEntrySynchronizationOperation.java |  6 +-
 ...nderQueueEntrySynchronizationOperationTest.java | 71 ++++++++++++++++++++++
 3 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheFactoryStatics.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheFactoryStatics.java
index 9b0f989..ce4998e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheFactoryStatics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheFactoryStatics.java
@@ -81,15 +81,13 @@ public class CacheFactoryStatics {
    *         {@link Cache#isClosed closed}
    */
   public static Cache getAnyInstance() {
-    synchronized (InternalCacheBuilder.class) {
-      InternalCache instance = GemFireCacheImpl.getInstance();
-      if (instance == null) {
-        throw new CacheClosedException(
-            "A cache has not yet been created.");
-      } else {
-        instance.getCancelCriterion().checkCancelInProgress(null);
-        return instance;
-      }
+    InternalCache instance = GemFireCacheImpl.getInstance();
+    if (instance == null) {
+      throw new CacheClosedException(
+          "A cache has not yet been created.");
+    } else {
+      instance.getCancelCriterion().checkCancelInProgress(null);
+      return instance;
     }
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java
index 08d1e5b..bfad7a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation.java
@@ -95,7 +95,7 @@ public class GatewaySenderQueueEntrySynchronizationOperation {
   }
 
   protected GemFireCacheImpl getCache() {
-    return (GemFireCacheImpl) CacheFactory.getAnyInstance();
+    return (GemFireCacheImpl) region.getDistributionManager().getCache();
   }
 
   private void initializeEntriesToSynchronize(
@@ -163,8 +163,8 @@ public class GatewaySenderQueueEntrySynchronizationOperation {
       }
     }
 
-    private Cache getCache() {
-      return CacheFactory.getAnyInstance();
+    Cache getCache() {
+      return dmgr.getCache();
     }
   }
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperationTest.java
new file mode 100644
index 0000000..e9f0466
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperationTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You 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.apache.geode.internal.cache.wan;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InternalRegion;
+
+public class GatewaySenderQueueEntrySynchronizationOperationTest {
+  private DistributionManager distributionManager;
+  private InternalDistributedMember recipient;
+  private GatewaySenderQueueEntrySynchronizationOperation operation;
+  private InternalRegion region;
+  private GemFireCacheImpl cache;
+
+  @Before
+  public void setup() {
+    distributionManager = mock(DistributionManager.class, RETURNS_DEEP_STUBS);
+    recipient = mock(InternalDistributedMember.class);
+    region = mock(InternalRegion.class);
+    cache = mock(GemFireCacheImpl.class);
+  }
+
+  @Test
+  public void ReplyProcessorGetCacheDelegateToDistributionManager() {
+    operation = mock(GatewaySenderQueueEntrySynchronizationOperation.class);
+    GatewaySenderQueueEntrySynchronizationOperation.GatewaySenderQueueEntrySynchronizationReplyProcessor processor =
+        new GatewaySenderQueueEntrySynchronizationOperation.GatewaySenderQueueEntrySynchronizationReplyProcessor(
+            distributionManager, recipient, operation);
+    when(distributionManager.getCache()).thenReturn(cache);
+
+    assertThat(processor.getCache()).isEqualTo(cache);
+  }
+
+  @Test
+  public void GatewaySenderQueueEntrySynchronizationOperationGetCacheDelegateToDistributionManager() {
+    InitialImageOperation.Entry entry = mock(InitialImageOperation.Entry.class);
+    List<InitialImageOperation.Entry> list = new ArrayList<>();
+    list.add(entry);
+    operation = new GatewaySenderQueueEntrySynchronizationOperation(recipient, region, list);
+    when(region.getDistributionManager()).thenReturn(distributionManager);
+    when(distributionManager.getCache()).thenReturn(cache);
+
+    assertThat(operation.getCache()).isEqualTo(cache);
+  }
+}