This is an automated email from the ASF dual-hosted git repository.
agingade pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new cee84bb GEODE-6665: Avoid creating regions on Locator (#3480)
cee84bb is described below
commit cee84bbc53c707b2ca13ca664fb3087fec1c71ed
Author: agingade <aging...@pivotal.io>
AuthorDate: Thu Apr 18 10:58:06 2019 -0700
GEODE-6665: Avoid creating regions on Locator (#3480)
* GEODE-6665: Avoid creating regions on Locator
---
.../modules/util/BootstrappingFunctionTest.java | 129 +++++++++++++++++++++
.../geode/modules/util/BootstrappingFunction.java | 18 ++-
2 files changed, 143 insertions(+), 4 deletions(-)
diff --git
a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/BootstrappingFunctionTest.java
b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/BootstrappingFunctionTest.java
new file mode 100644
index 0000000..5a48cd5
--- /dev/null
+++
b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/BootstrappingFunctionTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.modules.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+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;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.ResultSender;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.test.junit.categories.SecurityTest;
+
+@Category({SecurityTest.class})
+public class BootstrappingFunctionTest {
+
+ @Test
+ public void isLocatorReturnsTrueForLocatorMember() {
+ BootstrappingFunction bootstrappingFunction = new BootstrappingFunction();
+ GemFireCacheImpl gemFireCacheImpl = mock(GemFireCacheImpl.class);
+ InternalDistributedSystem distributedSystem =
mock(InternalDistributedSystem.class);
+ InternalDistributedMember internalDistributedMember =
mock(InternalDistributedMember.class);
+ DistributionManager distributionManager = mock(DistributionManager.class);
+
+
when(gemFireCacheImpl.getDistributedSystem()).thenReturn(distributedSystem);
+
when(distributedSystem.getDistributionManager()).thenReturn(distributionManager);
+
when(distributedSystem.getDistributedMember()).thenReturn(internalDistributedMember);
+ when(internalDistributedMember.getVmKind())
+ .thenReturn(ClusterDistributionManager.LOCATOR_DM_TYPE);
+
+ assertThat(bootstrappingFunction.isLocator(gemFireCacheImpl)).isTrue();
+ }
+
+ @Test
+ public void isLocatorReturnsFalseForNonLocatorMember() {
+ BootstrappingFunction bootstrappingFunction = new BootstrappingFunction();
+ GemFireCacheImpl gemFireCacheImpl = mock(GemFireCacheImpl.class);
+ InternalDistributedSystem distributedSystem =
mock(InternalDistributedSystem.class);
+ InternalDistributedMember internalDistributedMember =
mock(InternalDistributedMember.class);
+ DistributionManager distributionManager = mock(DistributionManager.class);
+
+
when(gemFireCacheImpl.getDistributedSystem()).thenReturn(distributedSystem);
+
when(distributedSystem.getDistributionManager()).thenReturn(distributionManager);
+
when(distributedSystem.getDistributedMember()).thenReturn(internalDistributedMember);
+ when(internalDistributedMember.getVmKind())
+ .thenReturn(ClusterDistributionManager.NORMAL_DM_TYPE);
+
+ assertThat(bootstrappingFunction.isLocator(gemFireCacheImpl)).isFalse();
+ }
+
+ @Test
+ public void registerFunctionIsNotCalledOnLocator() {
+ BootstrappingFunction bootstrappingFunction = spy(new
BootstrappingFunction());
+ GemFireCacheImpl gemFireCacheImpl = mock(GemFireCacheImpl.class);
+ InternalDistributedSystem distributedSystem =
mock(InternalDistributedSystem.class);
+ InternalDistributedMember internalDistributedMember =
mock(InternalDistributedMember.class);
+ DistributionManager distributionManager = mock(DistributionManager.class);
+
+
when(bootstrappingFunction.verifyCacheExists()).thenReturn(gemFireCacheImpl);
+
when(gemFireCacheImpl.getDistributedSystem()).thenReturn(distributedSystem);
+
when(distributedSystem.getDistributionManager()).thenReturn(distributionManager);
+
when(distributedSystem.getDistributedMember()).thenReturn(internalDistributedMember);
+ when(internalDistributedMember.getVmKind())
+ .thenReturn(ClusterDistributionManager.LOCATOR_DM_TYPE);
+
doNothing().when(distributionManager).addMembershipListener(bootstrappingFunction);
+
+ FunctionContext functionContext = mock(FunctionContext.class);
+ ResultSender resultSender = mock(ResultSender.class);
+ doNothing().when(resultSender).lastResult(any());
+
+ when(functionContext.getResultSender()).thenReturn(resultSender);
+
+ bootstrappingFunction.execute(functionContext);
+
+ verify(bootstrappingFunction, never()).registerFunctions();
+ }
+
+ @Test
+ public void registerFunctionGetsCalledOnNonLocators() {
+ BootstrappingFunction bootstrappingFunction = spy(new
BootstrappingFunction());
+ GemFireCacheImpl gemFireCacheImpl = mock(GemFireCacheImpl.class);
+ InternalDistributedSystem distributedSystem =
mock(InternalDistributedSystem.class);
+ InternalDistributedMember internalDistributedMember =
mock(InternalDistributedMember.class);
+ DistributionManager distributionManager = mock(DistributionManager.class);
+
+
when(bootstrappingFunction.verifyCacheExists()).thenReturn(gemFireCacheImpl);
+
when(gemFireCacheImpl.getDistributedSystem()).thenReturn(distributedSystem);
+
when(distributedSystem.getDistributionManager()).thenReturn(distributionManager);
+
when(distributedSystem.getDistributedMember()).thenReturn(internalDistributedMember);
+ when(internalDistributedMember.getVmKind())
+ .thenReturn(ClusterDistributionManager.NORMAL_DM_TYPE);
+
doNothing().when(distributionManager).addMembershipListener(bootstrappingFunction);
+
+ FunctionContext functionContext = mock(FunctionContext.class);
+ ResultSender resultSender = mock(ResultSender.class);
+ doNothing().when(resultSender).lastResult(any());
+
+ when(functionContext.getResultSender()).thenReturn(resultSender);
+
+ bootstrappingFunction.execute(functionContext);
+
+ verify(bootstrappingFunction, times(1)).registerFunctions();
+ }
+}
diff --git
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
index 4cc9c09..2e606a0 100644
---
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
+++
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
@@ -31,6 +31,8 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.MembershipListener;
@@ -60,14 +62,22 @@ public class BootstrappingFunction implements Function,
MembershipListener, Data
// Register as membership listener
registerAsMembershipListener(cache);
- // Register functions
- registerFunctions();
+ if (!isLocator(cache)) {
+ // Register functions
+ registerFunctions();
+ }
// Return status
context.getResultSender().lastResult(Boolean.TRUE);
}
- private Cache verifyCacheExists() {
+ protected boolean isLocator(Cache cache) {
+ DistributedSystem system = cache.getDistributedSystem();
+ InternalDistributedMember member = (InternalDistributedMember)
system.getDistributedMember();
+ return member.getVmKind() == ClusterDistributionManager.LOCATOR_DM_TYPE;
+ }
+
+ protected Cache verifyCacheExists() {
int timeToWait = 0;
Cache cache = null;
while (timeToWait < TIME_TO_WAIT_FOR_CACHE) {
@@ -104,7 +114,7 @@ public class BootstrappingFunction implements Function,
MembershipListener, Data
dm.addMembershipListener(this);
}
- private void registerFunctions() {
+ protected void registerFunctions() {
// Synchronize so that these functions aren't registered twice. The
// constructor for the CreateRegionFunction creates a meta region.
registerFunctionLock.lock();
