Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/66f9a34b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/66f9a34b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/66f9a34b Branch: refs/heads/ignite-gg-10994 Commit: 66f9a34bfc13eb54822581aefcd2c687c5bc9245 Parents: b189bb2 Author: nikolay_tikhonov <[email protected]> Authored: Wed Mar 23 19:45:51 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Wed Mar 23 19:46:16 2016 +0300 ---------------------------------------------------------------------- .../continuous/CacheContinuousQueryManager.java | 13 +++++++++---- .../continuous/GridContinuousProcessor.java | 2 +- .../processors/cache/IgniteCacheAbstractTest.java | 6 ++++++ .../cache/IgniteCacheEntryListenerAbstractTest.java | 16 +++++++++++++++- .../distributed/IgniteCacheManyClientsTest.java | 6 ++++++ ...acheContinuousQueryFailoverAbstractSelfTest.java | 6 ++++++ 6 files changed, 43 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/66f9a34b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index 869a51b..c01f636 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -489,7 +489,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { false, false, loc, - keepBinary); + keepBinary, + false); } /** @@ -528,6 +529,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { true, notifyExisting, loc, + false, false); } @@ -608,6 +610,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param internal Internal flag. * @param notifyExisting Notify existing flag. * @param loc Local flag. + * @param onStart Waiting topology exchange. * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ @@ -619,7 +622,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { boolean internal, boolean notifyExisting, boolean loc, - final boolean keepBinary) throws IgniteCheckedException + final boolean keepBinary, + boolean onStart) throws IgniteCheckedException { cctx.checkSecurity(SecurityPermission.CACHE_READ); @@ -650,7 +654,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { pred).get(); try { - if (hnd.isQuery() && cctx.userCache()) + if (hnd.isQuery() && cctx.userCache() && !onStart) hnd.waitTopologyFuture(cctx.kernalContext()); } catch (IgniteCheckedException e) { @@ -905,7 +909,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { false, false, false, - keepBinary + keepBinary, + onStart ); } http://git-wip-us.apache.org/repos/asf/ignite/blob/66f9a34b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index f2d6e1e..99e0bb5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -915,7 +915,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { if (proc != null) { GridCacheAdapter cache = ctx.cache().internalCache(hnd0.cacheName()); - if (cache != null && !cache.isLocal()) + if (cache != null && !cache.isLocal() && cache.context().userCache()) req.addUpdateCounters(ctx.localNodeId(), cache.context().topology().updateCounters()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/66f9a34b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 7df72f0..ce60232 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentHashMap8; @@ -100,6 +101,11 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { if (isDebug()) disco.setAckTimeout(Integer.MAX_VALUE); + MemoryEventStorageSpi eventSpi = new MemoryEventStorageSpi(); + eventSpi.setExpireCount(100); + + cfg.setEventStorageSpi(eventSpi); + cfg.setDiscoverySpi(disco); cfg.setCacheConfiguration(cacheConfiguration(gridName)); http://git-wip-us.apache.org/repos/asf/ignite/blob/66f9a34b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index 35fbbd5..1f58765 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -60,11 +60,13 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; @@ -118,6 +120,18 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb return cfg; } + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + MemoryEventStorageSpi eventSpi = new MemoryEventStorageSpi(); + eventSpi.setExpireCount(50); + + cfg.setEventStorageSpi(eventSpi); + + return cfg; + } + /** * @return Cache memory mode. */ @@ -421,7 +435,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb barrier.await(); - for (int i = 0; i < 200; i++) { + for (int i = 0; i < 100; i++) { cache.registerCacheEntryListener(cfg); cache.deregisterCacheEntryListener(cfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/66f9a34b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java index 8d4af19..ddc75ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java @@ -38,6 +38,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -71,6 +72,11 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest { cfg.setPeerClassLoadingEnabled(false); cfg.setTimeServerPortRange(200); + MemoryEventStorageSpi eventSpi = new MemoryEventStorageSpi(); + eventSpi.setExpireCount(100); + + cfg.setEventStorageSpi(eventSpi); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setLocalPortRange(200); ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); http://git-wip-us.apache.org/repos/asf/ignite/blob/66f9a34b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index f104f21..4454379 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -90,6 +90,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; @@ -136,6 +137,11 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC cfg.setCommunicationSpi(commSpi); + MemoryEventStorageSpi eventSpi = new MemoryEventStorageSpi(); + eventSpi.setExpireCount(50); + + cfg.setEventStorageSpi(eventSpi); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(cacheMode());
