Repository: ignite Updated Branches: refs/heads/ignite-zk c625f7b10 -> 8790099eb
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8790099e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8790099e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8790099e Branch: refs/heads/ignite-zk Commit: 8790099eb97322b88bf74bc7a4f6d86113e288d8 Parents: c625f7b Author: sboikov <[email protected]> Authored: Mon Dec 4 14:36:49 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 4 16:13:01 2017 +0300 ---------------------------------------------------------------------- .../continuous/GridContinuousProcessor.java | 3 +++ .../zk/internal/ZookeeperClusterNode.java | 19 ++++++++++++++-- ...unctionExcludeNeighborsAbstractSelfTest.java | 8 ++----- .../ignite/internal/IgniteClientRejoinTest.java | 8 +++---- .../IgniteClusterActivateDeactivateTest.java | 3 ++- .../GridCacheQueueClientDisconnectTest.java | 15 ++++++++++++- .../IgniteClientDataStructuresAbstractTest.java | 3 ++- ...yRemoteFilterMissingInClassPathSelfTest.java | 23 ++++++++++++-------- ...CacheContinuousQueryClientReconnectTest.java | 3 +++ .../ZookeeperDiscoverySpiBasicTest.java | 5 +++-- .../GridJtaTransactionManagerSelfTest.java | 21 ++++++++++++------ .../GridPartitionedCacheJtaFactorySelfTest.java | 19 +++++++++++----- .../ignite/internal/GridFactorySelfTest.java | 3 ++- .../p2p/GridP2PUserVersionChangeSelfTest.java | 5 +++-- 14 files changed, 96 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/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 5da8f3f..0583a8a 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 @@ -553,6 +553,9 @@ public class GridContinuousProcessor extends GridProcessorAdapter { try { hnd = U.unmarshal(marsh, routineInfo.hnd, U.resolveClassLoader(ctx.config())); + + if (ctx.config().isPeerClassLoadingEnabled()) + hnd.p2pUnmarshal(routineInfo.srcNodeId, ctx); } catch (IgniteCheckedException e) { U.error(log, "Failed to unmarshal continuous routine handler, ignore routine [" + http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java index aa90c67..c2d15cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.UUID; import org.apache.ignite.cache.CacheMetrics; import org.apache.ignite.cluster.ClusterMetrics; -import org.apache.ignite.internal.ClusterMetricsSnapshot; import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.managers.discovery.IgniteClusterNode; import org.apache.ignite.internal.util.tostring.GridToStringExclude; @@ -42,7 +41,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTE /** * */ -public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { +public class ZookeeperClusterNode implements IgniteClusterNode, Serializable, Comparable<ZookeeperClusterNode> { /** */ private static final long serialVersionUID = 0L; @@ -285,6 +284,22 @@ public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { } /** {@inheritDoc} */ + @Override public int compareTo(@Nullable ZookeeperClusterNode node) { + if (node == null) + return 1; + + int res = Long.compare(order, node.order); + + if (res == 0) { + assert id().equals(node.id()) : "Duplicate order [this=" + this + ", other=" + node + ']'; + + res = id().compareTo(node.id()); + } + + return res; + } + + /** {@inheritDoc} */ @Override public int hashCode() { return id.hashCode(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java index 900d4f5..eee47c7 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -124,12 +123,9 @@ public abstract class AffinityFunctionExcludeNeighborsAbstractSelfTest extends G Affinity<Object> aff = g.affinity(DEFAULT_CACHE_NAME); - List<TcpDiscoveryNode> top = new ArrayList<>(); + List<ClusterNode> top = new ArrayList<>(g.cluster().nodes()); - for (ClusterNode node : g.cluster().nodes()) - top.add((TcpDiscoveryNode) node); - - Collections.sort(top); + Collections.sort((List)top); assertEquals(grids, top.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java index 7fad8ad..67421e2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java @@ -252,14 +252,14 @@ public class IgniteClientRejoinTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClientsReconnectDisabled() throws Exception { - // TODO ZK - if (!tcpDiscovery()) - return; - clientReconnectDisabled = true; Ignite srv1 = startGrid("server1"); + // TODO ZK + if (!tcpDiscovery()) + return; + crd = ((IgniteKernal)srv1).localNode(); Ignite srv2 = startGrid("server2"); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java index 1827c65..f5856d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.internal.IgniteClientReconnectAbstractTest; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.TestRecordingCommunicationSpi; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage; @@ -1184,7 +1185,7 @@ public class IgniteClusterActivateDeactivateTest extends GridCommonAbstractTest // Stop all nodes participating in state change and not allow last node to finish exchange. for (int i = 0; i < 4; i++) - ((TestTcpDiscoverySpi)ignite(i).configuration().getDiscoverySpi()).simulateNodeFailure(); + ((IgniteDiscoverySpi)ignite(i).configuration().getDiscoverySpi()).simulateNodeFailure(); for (int i = 0; i < 4; i++) stopGrid(getTestIgniteInstanceName(i), true, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java index ed54377..71b21de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +/** + * + */ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { /** */ private static final String IGNITE_QUEUE_NAME = "ignite-queue-client-reconnect-test"; @@ -66,6 +69,10 @@ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { return cfg; } + /** + * @param cacheAtomicityMode Atomicity mode. + * @return Configuration. + */ private static CollectionConfiguration collectionConfiguration(CacheAtomicityMode cacheAtomicityMode) { CollectionConfiguration colCfg = new CollectionConfiguration(); @@ -74,6 +81,9 @@ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { return colCfg; } + /** + * @throws Exception If failed. + */ public void testClientDisconnect() throws Exception { try { Ignite server = startGrid(0); @@ -104,7 +114,10 @@ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { U.sleep(5000); - server.close(); + if (tcpDiscovery()) + server.close(); + else + reconnectClient(log, client); boolean countReachedZero = latch.await(FAILURE_DETECTION_TIMEOUT * 2, TimeUnit.MILLISECONDS); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java index 7f1fe68..9dee9e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java @@ -458,7 +458,8 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA assertTrue(ignite.configuration().isClientMode()); - assertEquals(clientDiscovery(), ignite.configuration().getDiscoverySpi().isClientMode()); + if (tcpDiscovery()) + assertEquals(clientDiscovery(), ignite.configuration().getDiscoverySpi().isClientMode()); return ignite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java index 92c1760..226302f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java @@ -104,7 +104,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC setExternalLoader = true; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); clientMode = true; @@ -112,8 +112,10 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC startGrid(2); - assertTrue(log.toString().contains("Failed to unmarshal continuous query remote filter on client node. " + - "Can be ignored.")); + String logStr = log.toString(); + + assertTrue(logStr.contains("Failed to unmarshal continuous query remote filter on client node. " + + "Can be ignored.") || logStr.contains("Failed to unmarshal continuous routine handler")); } /** @@ -127,7 +129,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC clientMode = false; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); clientMode = true; @@ -149,15 +151,18 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC setExternalLoader = true; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); setExternalLoader = false; startGrid(2); - assertTrue(log.toString().contains("class org.apache.ignite.IgniteCheckedException: " + - "Failed to find class with given class loader for unmarshalling")); + String logStr = log.toString(); + + assertTrue(logStr.contains("class org.apache.ignite.IgniteCheckedException: " + + "Failed to find class with given class loader for unmarshalling") + || logStr.contains("Failed to unmarshal continuous routine handler")); } /** @@ -171,7 +176,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC setExternalLoader = true; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); @@ -185,7 +190,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC * @param cache Ignite cache. * @throws Exception If fail. */ - private void executeContiniouseQuery(IgniteCache cache) throws Exception { + private void executeContinuousQuery(IgniteCache cache) throws Exception { ContinuousQuery<Integer, String> qry = new ContinuousQuery<>(); qry.setLocalListener( http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java index 9ad6d4e..906cc7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java @@ -119,6 +119,9 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR * @throws Exception If failed. */ public void testReconnectClientAndLeftRouter() throws Exception { + if (!tcpDiscovery()) + return; + Ignite client = grid(serverCount()); final Ignite srv = clientRouter(client); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java index 8fd3b8a..f88bb77 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java @@ -51,6 +51,7 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.managers.discovery.DiscoveryLocalJoinData; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.G; @@ -59,13 +60,11 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.logger.java.JavaLogger; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.discovery.DiscoverySpi; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.apache.zookeeper.ZKUtil; import org.apache.zookeeper.ZkTestClientCnxnSocketNIO; import org.apache.zookeeper.ZooKeeper; import org.jetbrains.annotations.Nullable; @@ -1761,6 +1760,8 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { if (disconnectedC != null) { DiscoverySpiBlockJoinListener lsnr = new DiscoverySpiBlockJoinListener(); + ((IgniteDiscoverySpi)client.configuration().getDiscoverySpi()).setInternalListener(lsnr); + lsnr.startBlock(); lsnrs.add(lsnr); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java index a181068..5cad167 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java @@ -44,13 +44,7 @@ public class GridJtaTransactionManagerSelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName). setCacheConfiguration(defaultCacheConfiguration().setCacheMode(PARTITIONED)); - cfg.getTransactionConfiguration().setTxManagerFactory(new Factory<TransactionManager>() { - private static final long serialVersionUID = 0L; - - @Override public TransactionManager create() { - return jotm.getTransactionManager(); - } - }); + cfg.getTransactionConfiguration().setTxManagerFactory(new TestTxManagerFactory()); return cfg; } @@ -205,4 +199,17 @@ public class GridJtaTransactionManagerSelfTest extends GridCommonAbstractTest { cache.removeAll(); } } + + /** + * + */ + static class TestTxManagerFactory implements Factory<TransactionManager> { + /** */ + private static final long serialVersionUID = 0L; + + /** {@inheritDoc} */ + @Override public TransactionManager create() { + return jotm.getTransactionManager(); + } + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java index f6fd5c7..14b7fae 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/jta/GridPartitionedCacheJtaFactorySelfTest.java @@ -30,12 +30,19 @@ public class GridPartitionedCacheJtaFactorySelfTest extends AbstractCacheJtaSelf @Override protected void configureJta(IgniteConfiguration cfg) { TransactionConfiguration txCfg = cfg.getTransactionConfiguration(); - txCfg.setTxManagerFactory(new Factory<TransactionManager>() { - private static final long serialVersionUID = 0L; + txCfg.setTxManagerFactory(new TestTxManagerFactory()); + } + + /** + * + */ + static class TestTxManagerFactory implements Factory<TransactionManager> { + /** */ + private static final long serialVersionUID = 0L; - @Override public TransactionManager create() { - return jotm.getTransactionManager(); - } - }); + /** {@inheritDoc} */ + @Override public TransactionManager create() { + return jotm.getTransactionManager(); + } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index 75128fc..b453858 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -998,7 +998,8 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { startGrid("1", c); - assert ((TcpDiscoverySpi)c.getDiscoverySpi()).started(); + if (tcpDiscovery()) + assert ((TcpDiscoverySpi)c.getDiscoverySpi()).started(); try { startGrid("2", c); http://git-wip-us.apache.org/repos/asf/ignite/blob/8790099e/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java index b861e19..46da3cc 100644 --- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java @@ -44,6 +44,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testsuites.IgniteIgnore; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED; @@ -255,12 +256,12 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { ignite2.events().localListen(new IgnitePredicate<Event>() { @Override public boolean apply(Event evt) { - if (evt.type() == EVT_NODE_LEFT) + if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED) discoLatch.countDown(); return true; } - }, EVT_NODE_LEFT); + }, EVT_NODE_LEFT, EVT_NODE_FAILED); Integer res1 = (Integer)ignite1.compute().execute(task1, ignite2.cluster().localNode().id());
