You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by es...@apache.org on 2020/12/16 22:48:06 UTC
[geode] branch support/1.12 updated: GEODE-8779: Register interest
only when local cache is enabled. (#5836)
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new b414d8a GEODE-8779: Register interest only when local cache is enabled. (#5836)
b414d8a is described below
commit b414d8ae61e989246d92d90c447ca6fe4f42eedb
Author: Eric Shu <es...@pivotal.io>
AuthorDate: Mon Dec 14 17:42:00 2020 -0800
GEODE-8779: Register interest only when local cache is enabled. (#5836)
(cherry picked from commit f53fa752e6d322d6fd24237212a3b958a5b882b8)
---
.../internal/common/ClientServerSessionCache.java | 9 +++++++--
.../catalina/AbstractSessionCacheJUnitTest.java | 3 ++-
.../catalina/ClientServerSessionCacheJUnitTest.java | 20 ++++++++++++++++++--
.../session/catalina/ClientServerSessionCache.java | 12 ++++++++----
.../catalina/ClientServerSessionCacheTest.java | 21 ++++++++++++++++++++-
5 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
index 603248a..7633f36 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
@@ -127,7 +128,9 @@ public class ClientServerSessionCache extends AbstractSessionCache {
LOG.debug("Retrieved session region: " + this.sessionRegion);
// Register interest in case users provide their own client cache region
- sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ if (sessionRegion.getAttributes().getDataPolicy() != DataPolicy.EMPTY) {
+ sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
}
}
@@ -175,7 +178,9 @@ public class ClientServerSessionCache extends AbstractSessionCache {
// Create the region
Region region = factory.create(regionName);
- region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ if (enableLocalCache) {
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
return region;
}
}
diff --git a/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheJUnitTest.java b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheJUnitTest.java
index 04cc183..99906cc 100644
--- a/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheJUnitTest.java
+++ b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheJUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.modules.session.catalina;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -50,7 +51,7 @@ public abstract class AbstractSessionCacheJUnitTest {
protected SessionManager sessionManager = mock(SessionManager.class);
@SuppressWarnings("unchecked")
- protected Region<String, HttpSession> sessionRegion = mock(Region.class);
+ protected Region<String, HttpSession> sessionRegion = mock(Region.class, RETURNS_DEEP_STUBS);
protected DistributedSystem distributedSystem = mock(DistributedSystem.class);
protected Log logger = mock(Log.class);
protected Execution emptyExecution = mock(Execution.class);
diff --git a/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheJUnitTest.java b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheJUnitTest.java
index 2e34681..0ca0ce3 100644
--- a/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheJUnitTest.java
+++ b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheJUnitTest.java
@@ -21,6 +21,7 @@ import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -95,6 +96,7 @@ public class ClientServerSessionCacheJUnitTest extends AbstractSessionCacheJUnit
when(cache.getDistributedSystem()).thenReturn(distributedSystem);
doReturn(regionFactory).when(cache)
.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY_HEAP_LRU);
+ doReturn(sessionRegion).when(regionFactory).create(any());
when(((InternalClientCache) cache).isClient()).thenReturn(true);
when(emptyExecution.execute(any(Function.class))).thenReturn(collector);
@@ -188,7 +190,6 @@ public class ClientServerSessionCacheJUnitTest extends AbstractSessionCacheJUnit
sessionCache.initialize();
verify(regionFactory).addCacheListener(any(SessionExpirationCacheListener.class));
- verify(sessionRegion).registerInterest("ALL_KEYS", InterestResultPolicy.KEYS);
}
@Test
@@ -231,11 +232,26 @@ public class ClientServerSessionCacheJUnitTest extends AbstractSessionCacheJUnit
doReturn(sessionRegion).when(cache).getRegion(sessionRegionName);
doReturn(attributes).when(sessionRegion).getAttributes();
doReturn(cacheListeners).when(attributes).getCacheListeners();
+ when(attributes.getDataPolicy()).thenReturn(DataPolicy.DEFAULT);
+
+ sessionCache.initialize();
+
+ verify(sessionRegion).registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ @Test
+ public void createOrRetrieveRegionWithNonNullSessionProxyRegionNotRegistersInterestIfEmpty() {
+ @SuppressWarnings("unchecked")
+ CacheListener<String, HttpSession>[] cacheListeners =
+ new CacheListener[] {new SessionExpirationCacheListener()};
+ doReturn(sessionRegion).when(cache).getRegion(sessionRegionName);
+ doReturn(attributes).when(sessionRegion).getAttributes();
+ doReturn(cacheListeners).when(attributes).getCacheListeners();
when(attributes.getDataPolicy()).thenReturn(DataPolicy.EMPTY);
sessionCache.initialize();
- verify(sessionRegion).registerInterest("ALL_KEYS", InterestResultPolicy.KEYS);
+ verify(sessionRegion, never()).registerInterestForAllKeys(InterestResultPolicy.KEYS);
}
@Test
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
index 107fb32..8f54abd 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
@@ -20,6 +20,7 @@ import java.util.Set;
import javax.servlet.http.HttpSession;
+import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
@@ -189,7 +190,9 @@ public class ClientServerSessionCache extends AbstractSessionCache {
sessionRegion.getAttributesMutator().addCacheListener(new SessionExpirationCacheListener());
}
- sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ if (sessionRegion.getAttributes().getDataPolicy() != DataPolicy.EMPTY) {
+ sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
}
}
@@ -224,10 +227,11 @@ public class ClientServerSessionCache extends AbstractSessionCache {
Region<String, HttpSession> createLocalSessionRegionWithRegisterInterest() {
Region<String, HttpSession> region = createLocalSessionRegion();
- // register interest are needed for proxy or caching-proxy client:
+ // register interest are needed for caching proxy client:
// to get updates from server if local cache is enabled;
- // to get callbacks for listener invocation for proxy client.
- region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ if (region.getAttributes().getDataPolicy() != DataPolicy.EMPTY) {
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
return region;
}
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheTest.java
index 88fb0dd..c8f59ee 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/ClientServerSessionCacheTest.java
@@ -14,15 +14,19 @@
*/
package org.apache.geode.modules.session.catalina;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import org.junit.Test;
+import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.client.ClientCache;
public class ClientServerSessionCacheTest {
@@ -32,7 +36,7 @@ public class ClientServerSessionCacheTest {
public void registerInterestForSessionRegion() {
SessionManager manager = mock(SessionManager.class);
ClientCache clientCache = mock(ClientCache.class);
- Region region = mock(Region.class);
+ Region region = mock(Region.class, RETURNS_DEEP_STUBS);
ClientServerSessionCache cache = spy(new ClientServerSessionCache(manager, clientCache));
doReturn(region).when(cache).createLocalSessionRegion();
@@ -41,4 +45,19 @@ public class ClientServerSessionCacheTest {
verify(region).registerInterestForAllKeys(InterestResultPolicy.KEYS);
}
+ @Test
+ public void doesNotRegisterInterestIfLocalCacheNotEnabled() {
+ final SessionManager manager = mock(SessionManager.class);
+ final ClientCache clientCache = mock(ClientCache.class);
+ final Region<?, ?> region = mock(Region.class);
+ final RegionAttributes<?, ?> attributes = mock(RegionAttributes.class);
+ final ClientServerSessionCache cache = spy(new ClientServerSessionCache(manager, clientCache));
+ doReturn(region).when(cache).createLocalSessionRegion();
+ doReturn(attributes).when(region).getAttributes();
+ doReturn(DataPolicy.EMPTY).when(attributes).getDataPolicy();
+
+ cache.createLocalSessionRegionWithRegisterInterest();
+
+ verify(region, never()).registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
}