Repository: ignite Updated Branches: refs/heads/ignite-1537 49c8229e7 -> dc8b0b67d
ignite-2146 Avoid hang in 'cache.get' if topology locked. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc8b0b67 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc8b0b67 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc8b0b67 Branch: refs/heads/ignite-1537 Commit: dc8b0b67db92f4e7206777a89dd914920a1107ef Parents: 49c8229 Author: sboikov <[email protected]> Authored: Wed Dec 16 16:22:09 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 16 16:22:09 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/CacheGetInsideLockChangingTopologyTest.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dc8b0b67/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java index d31c4e7..7073a94 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java @@ -35,6 +35,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.GridCacheAlwaysEvictionPolicy; import org.apache.ignite.internal.util.typedef.internal.U; +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; @@ -80,6 +81,8 @@ public class CacheGetInsideLockChangingTopologyTest extends GridCommonAbstractTe @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); Boolean clientMode = client.get();
