Repository: incubator-ignite Updated Branches: refs/heads/ignite-709_3 64ed3f19c -> 4717ea97e
# ignite-709_3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4717ea97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4717ea97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4717ea97 Branch: refs/heads/ignite-709_3 Commit: 4717ea97ee36913901cbbc49725e930007280966 Parents: 64ed3f1 Author: sboikov <[email protected]> Authored: Thu May 14 23:34:54 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu May 14 23:34:54 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 26 +-- .../org/apache/ignite/internal/IgnitionEx.java | 6 +- .../discovery/GridDiscoveryManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 23 ++- .../processors/cache/GridCacheUtils.java | 11 ++ .../affinity/IgniteClientNodeAffinityTest.java | 185 +++++++++++++++++++ .../GridCacheQueueApiSelfAbstractTest.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + 8 files changed, 224 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index df6b2ee..5a03ed8 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -145,9 +145,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Default value for 'readFromBackup' flag. */ public static final boolean DFLT_READ_FROM_BACKUP = true; - /** Filter that accepts only server nodes. */ - public static final IgnitePredicate<ClusterNode> SERVER_NODES = new IgniteServerNodePredicate(); - /** Filter that accepts all nodes. */ public static final IgnitePredicate<ClusterNode> ALL_NODES = new IgniteAllNodesPredicate(); @@ -1740,37 +1737,18 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** - * Filter that accepts only server nodes. - */ - public static class IgniteServerNodePredicate implements IgnitePredicate<ClusterNode> { - /** */ - private static final long serialVersionUID = 0L; - - @Override public boolean apply(ClusterNode n) { - Boolean attr = n.attribute(IgniteNodeAttributes.ATTR_CLIENT_MODE); - - return attr != null && !attr; - } - - @Override public boolean equals(Object obj) { - if (obj == null) - return false; - - return obj.getClass().equals(this.getClass()); - } - } - - /** * Filter that accepts all nodes. */ public static class IgniteAllNodesPredicate implements IgnitePredicate<ClusterNode> { /** */ private static final long serialVersionUID = 0L; + /** {@inheritDoc} */ @Override public boolean apply(ClusterNode clusterNode) { return true; } + /** {@inheritDoc} */ @Override public boolean equals(Object obj) { if (obj == null) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 9c7340e..d7f785f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -2015,7 +2015,7 @@ public class IgnitionEx { cache.setRebalanceMode(SYNC); cache.setWriteSynchronizationMode(FULL_SYNC); cache.setAffinity(new RendezvousAffinityFunction(false, 20)); - cache.setNodeFilter(CacheConfiguration.SERVER_NODES); + cache.setNodeFilter(CacheConfiguration.ALL_NODES); cache.setStartSize(300); return cache; @@ -2036,7 +2036,7 @@ public class IgnitionEx { cache.setRebalanceMode(SYNC); cache.setWriteSynchronizationMode(FULL_SYNC); cache.setAffinity(new RendezvousAffinityFunction(false, 100)); - cache.setNodeFilter(CacheConfiguration.SERVER_NODES); + cache.setNodeFilter(CacheConfiguration.ALL_NODES); return cache; } @@ -2056,7 +2056,7 @@ public class IgnitionEx { ccfg.setRebalanceMode(SYNC); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setCacheMode(cfg.getCacheMode()); - ccfg.setNodeFilter(CacheConfiguration.SERVER_NODES); + ccfg.setNodeFilter(CacheConfiguration.ALL_NODES); ccfg.setNearConfiguration(new NearCacheConfiguration()); if (cfg.getCacheMode() == PARTITIONED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 0950774..59240b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -2515,7 +2515,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return {@code True} if this node is a data node for given cache. */ public boolean dataNode(ClusterNode node) { - return !node.isDaemon() && cacheFilter.apply(node); + return !node.isDaemon() && !CU.clientModeNode(node) && cacheFilter.apply(node); } /** @@ -2523,8 +2523,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return {@code True} if cache is accessible on the given node. */ public boolean cacheNode(ClusterNode node) { - return !node.isClient() && !node.isDaemon() && - (cacheFilter.apply(node) || clientNodes.containsKey(node.id())); + return !node.isDaemon() && + ((!CU.clientModeNode(node) && cacheFilter.apply(node)) || clientNodes.containsKey(node.id())); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 331e454..6ac5afc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -156,7 +156,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { cfg.setMemoryMode(DFLT_MEMORY_MODE); if (cfg.getNodeFilter() == null) - cfg.setNodeFilter(CacheConfiguration.SERVER_NODES); + cfg.setNodeFilter(CacheConfiguration.ALL_NODES); if (cfg.getAffinity() == null) { if (cfg.getCacheMode() == PARTITIONED) { @@ -713,7 +713,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { IgnitePredicate filter = ccfg.getNodeFilter(); - if (filter.apply(locNode)) { + if (!CU.clientModeNode(locNode) && filter.apply(locNode)) { CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(ccfg); CachePluginManager pluginMgr = desc.pluginManager(); @@ -1522,7 +1522,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { ClusterNode locNode = ctx.discovery().localNode(); - boolean affNodeStart = !clientStartOnly && nodeFilter.apply(locNode); + boolean affNodeStart = !clientStartOnly && !CU.clientModeNode(locNode) && nodeFilter.apply(locNode); boolean clientNodeStart = locNode.id().equals(initiatingNodeId); if (sharedCtx.cacheContext(CU.cacheId(cfg.getName())) != null) @@ -1966,7 +1966,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { // Check if we were asked to start a near cache. if (nearCfg != null) { - if (descCfg.getNodeFilter().apply(ctx.discovery().localNode())) { + ClusterNode locNode = ctx.discovery().localNode(); + + if (!CU.clientModeNode(locNode) && descCfg.getNodeFilter().apply(locNode)) { // If we are on a data node and near cache was enabled, return success, else - fail. if (descCfg.getNearConfiguration() != null) return new GridFinishedFuture<>(); @@ -2013,7 +2015,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { return new GridFinishedFuture<>(new CacheExistsException("Failed to start near cache " + "(a cache with the given name is not started): " + cacheName)); - if (ccfg.getNodeFilter().apply(ctx.discovery().localNode())) { + ClusterNode locNode = ctx.discovery().localNode(); + + if (!CU.clientModeNode(locNode) && ccfg.getNodeFilter().apply(locNode)) { if (ccfg.getNearConfiguration() != null) return new GridFinishedFuture<>(); else @@ -2326,8 +2330,13 @@ public class GridCacheProcessor extends GridProcessorAdapter { CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cachePreloadMode", "Cache preload mode", locAttr.cacheRebalanceMode(), rmtAttr.cacheRebalanceMode(), true); - if (locCfg.getAtomicityMode() == TRANSACTIONAL || - (rmtCfg.getNodeFilter().apply(rmtNode) && locCfg.getNodeFilter().apply(locNode))) + boolean checkStore = locCfg.getAtomicityMode() == TRANSACTIONAL || + (!CU.clientModeNode(rmtNode) && + !CU.clientModeNode(locNode) && + rmtCfg.getNodeFilter().apply(rmtNode) && + locCfg.getNodeFilter().apply(locNode)); + + if (checkStore) CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "storeFactory", "Store factory", locAttr.storeFactoryClassName(), rmtAttr.storeFactoryClassName(), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index e502b54..163e09a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1799,4 +1799,15 @@ public class GridCacheUtils { return res; } + /** + * @param node Node. + * @return {@code True} if flag {@link IgniteConfiguration#isClientMode()} is set given node. + */ + public static boolean clientModeNode(ClusterNode node) { + Boolean clientModeAttr = node.attribute(IgniteNodeAttributes.ATTR_CLIENT_MODE); + + assert clientModeAttr != null : node; + + return clientModeAttr != null && clientModeAttr; + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java new file mode 100644 index 0000000..f0af2c1 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/IgniteClientNodeAffinityTest.java @@ -0,0 +1,185 @@ +/* + * 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.ignite.cache.affinity; + +import org.apache.ignite.*; +import org.apache.ignite.cache.affinity.fair.*; +import org.apache.ignite.cache.affinity.rendezvous.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.util.*; + +import static org.apache.ignite.cache.CacheMode.*; + +/** + * + */ +public class IgniteClientNodeAffinityTest extends GridCommonAbstractTest { + /** */ + protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + + /** */ + private static final int NODE_CNT = 4; + + /** */ + private static final String CACHE1 = "cache1"; + + /** */ + private static final String CACHE2 = "cache2"; + + /** */ + private static final String CACHE3 = "cache3"; + + /** */ + private static final String CACHE4 = "cache4"; + + /** */ + private static final String CACHE5 = "cache5"; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + + if (gridName.equals(getTestGridName(NODE_CNT - 1))) + cfg.setClientMode(true); + + CacheConfiguration ccfg1 = new CacheConfiguration(); + + ccfg1.setBackups(1); + ccfg1.setName(CACHE1); + ccfg1.setAffinity(new RendezvousAffinityFunction()); + ccfg1.setNodeFilter(new TestNodesFilter()); + + CacheConfiguration ccfg2 = new CacheConfiguration(); + + ccfg2.setBackups(1); + ccfg2.setName(CACHE2); + ccfg2.setAffinity(new RendezvousAffinityFunction()); + + CacheConfiguration ccfg3 = new CacheConfiguration(); + + ccfg3.setBackups(1); + ccfg3.setName(CACHE3); + ccfg3.setAffinity(new FairAffinityFunction()); + ccfg3.setNodeFilter(new TestNodesFilter()); + + CacheConfiguration ccfg4 = new CacheConfiguration(); + + ccfg4.setCacheMode(REPLICATED); + ccfg4.setName(CACHE4); + ccfg4.setNodeFilter(new TestNodesFilter()); + + cfg.setCacheConfiguration(ccfg1, ccfg2, ccfg3, ccfg4); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + super.beforeTestsStarted(); + + startGrids(NODE_CNT); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + stopAllGrids(); + } + + /** + * @throws Exception If failed. + */ + public void testClientNodeNotInAffinity() throws Exception { + checkCache(CACHE1, 2); + + checkCache(CACHE2, 2); + + checkCache(CACHE3, 2); + + checkCache(CACHE4, 3); + + Ignite client = ignite(NODE_CNT - 1); + + CacheConfiguration ccfg = new CacheConfiguration(); + + ccfg.setBackups(0); + + ccfg.setNodeFilter(new TestNodesFilter()); + + try (IgniteCache<Integer, Integer> cache = client.createCache(ccfg)) { + checkCache(null, 1); + } + + try (IgniteCache<Integer, Integer> cache = client.createCache(ccfg, new NearCacheConfiguration())) { + checkCache(null, 1); + } + } + + /** + * @param cacheName Cache name. + * @param expNodes Expected number of nodes per partition. + */ + private void checkCache(String cacheName, int expNodes) { + log.info("Test cache: " + cacheName); + + Ignite client = ignite(NODE_CNT - 1); + + assertTrue(client.configuration().isClientMode()); + + ClusterNode clientNode = client.cluster().localNode(); + + for (int i = 0; i < NODE_CNT; i++) { + Ignite ignite = ignite(i); + + Affinity<Integer> aff = ignite.affinity(cacheName); + + for (int part = 0; part < aff.partitions(); part++) { + Collection<ClusterNode> nodes = aff.mapPartitionToPrimaryAndBackups(part); + + assertEquals(expNodes, nodes.size()); + + assertFalse(nodes.contains(clientNode)); + } + } + } + + /** + * + */ + private static class TestNodesFilter implements IgnitePredicate<ClusterNode> { + /** {@inheritDoc} */ + @Override public boolean apply(ClusterNode clusterNode) { + Boolean attr = clusterNode.attribute(IgniteNodeAttributes.ATTR_CLIENT_MODE); + + assertNotNull(attr); + + assertFalse(attr); + + return true; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java index 12397b2..7af0490 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java @@ -549,7 +549,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection CollectionConfiguration colCfg2 = collectionConfiguration(); - colCfg2.setNodeFilter(CacheConfiguration.SERVER_NODES); + colCfg2.setNodeFilter(CacheConfiguration.ALL_NODES); IgniteQueue queue1 = grid(0).queue("Queue1", 0, colCfg1); @@ -557,7 +557,7 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends IgniteCollection assertNotSame(getQueueCache(queue1), getQueueCache(queue2)); - colCfg1.setNodeFilter(CacheConfiguration.SERVER_NODES); + colCfg1.setNodeFilter(CacheConfiguration.ALL_NODES); IgniteQueue queue3 = grid(0).queue("Queue3", 0, colCfg1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4717ea97/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 9fd4e88..fbeee35 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -20,6 +20,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.fair.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cache.store.jdbc.*; @@ -85,6 +86,7 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteFairAffinityDynamicCacheSelfTest.class); suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class); suite.addTestSuite(IgniteCacheAffinitySelfTest.class); + suite.addTestSuite(IgniteClientNodeAffinityTest.class); // Swap tests. suite.addTestSuite(GridCacheSwapPreloadSelfTest.class);
