Repository: incubator-ignite Updated Branches: refs/heads/sprint-2 c2a895d49 -> 8c598c8db
Removed shmem from communication Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96742b52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96742b52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96742b52 Branch: refs/heads/sprint-2 Commit: 96742b5286b66606d1dc209ecc5afc88cedf1d43 Parents: c2a895d Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Mar 13 16:07:47 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Mar 13 16:07:47 2015 -0700 ---------------------------------------------------------------------- modules/core/pom.xml | 13 - .../apache/ignite/igfs/IgfsIpcEndpointType.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 348 +------------------ .../tcp/TcpCommunicationSpiMBean.java | 8 - .../src/test/config/io-manager-benchmark.xml | 1 - .../config/spring-cache-put-remove-load.xml | 6 - .../IgniteCacheContainsKeyAbstractSelfTest.java | 2 - .../GridCacheAtomicTimeoutSelfTest.java | 6 - .../IgniteCrossCacheTxStoreSelfTest.java | 6 - .../communication/GridIoManagerBenchmark0.java | 1 - .../spi/GridTcpSpiForwardingSelfTest.java | 1 - .../GridTcpCommunicationSpiAbstractTest.java | 17 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 1 - .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 13 +- ...pCommunicationSpiMultithreadedShmemTest.java | 28 -- ...ommunicationSpiMultithreadedTcpSelfTest.java | 28 -- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...GridTcpCommunicationSpiRecoverySelfTest.java | 1 - .../GridTcpCommunicationSpiShmemSelfTest.java | 31 -- .../tcp/GridTcpCommunicationSpiTcpSelfTest.java | 6 +- .../GridCacheStoreValueBytesNode.java | 5 - .../IgniteSpiCommunicationSelfTestSuite.java | 4 +- modules/hadoop/pom.xml | 13 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 11 - ...oopSecondaryFileSystemConfigurationTest.java | 12 - .../IgniteHadoopFileSystemAbstractSelfTest.java | 14 - ...IgniteHadoopFileSystemHandshakeSelfTest.java | 7 - .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 7 - .../hadoop/HadoopAbstractSelfTest.java | 6 - modules/yardstick/config/ignite-base-config.xml | 6 - .../yardstick/config/ignite-store-config.xml | 6 - 32 files changed, 22 insertions(+), 591 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 850e62d..42c892d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -35,13 +35,6 @@ <artifactId>ignite-core</artifactId> - <repositories> - <repository> - <id>GridGain External Repository</id> - <url>http://www.gridgainsystems.com/nexus/content/repositories/external</url> - </repository> - </repositories> - <dependencies> <dependency> <groupId>javax.cache</groupId> @@ -133,12 +126,6 @@ <classifier>jdk15</classifier> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.gridgain</groupId> - <artifactId>ignite-shmem</artifactId> - <version>1.0.0</version> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java index 475d36f..a7ecaa2 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointType.java @@ -25,5 +25,5 @@ public enum IgfsIpcEndpointType { SHMEM, /** TCP endpoint. */ - TCP; + TCP } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 852f369..b38dc15 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -25,19 +25,15 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; -import org.apache.ignite.internal.util.ipc.*; -import org.apache.ignite.internal.util.ipc.shmem.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.util.worker.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.*; -import org.apache.ignite.thread.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; @@ -97,7 +93,6 @@ import static org.apache.ignite.events.EventType.*; * <li>Connect timeout (see {@link #setConnectTimeout(long)})</li> * <li>Maximum connect timeout (see {@link #setMaxConnectTimeout(long)})</li> * <li>Reconnect attempts count (see {@link #setReconnectCount(int)})</li> - * <li>Local port to accept shared memory connections (see {@link #setSharedMemoryPort(int)})</li> * <li>Socket receive buffer size (see {@link #setSocketReceiveBuffer(int)})</li> * <li>Socket send buffer size (see {@link #setSocketSendBuffer(int)})</li> * <li>Socket write timeout (see {@link #setSocketWriteTimeout(long)})</li> @@ -145,10 +140,6 @@ import static org.apache.ignite.events.EventType.*; @IgniteSpiConsistencyChecked(optional = false) public class TcpCommunicationSpi extends IgniteSpiAdapter implements CommunicationSpi<Message>, TcpCommunicationSpiMBean { - /** IPC error message. */ - public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " + - "(switching to TCP, may be slower)."; - /** Node attribute that is mapped to node IP addresses (value is <tt>comm.tcp.addrs</tt>). */ public static final String ATTR_ADDRS = "comm.tcp.addrs"; @@ -158,18 +149,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** Node attribute that is mapped to node port number (value is <tt>comm.tcp.port</tt>). */ public static final String ATTR_PORT = "comm.tcp.port"; - /** Node attribute that is mapped to node port number (value is <tt>comm.shmem.tcp.port</tt>). */ - public static final String ATTR_SHMEM_PORT = "comm.shmem.tcp.port"; - /** Node attribute that is mapped to node's external addresses (value is <tt>comm.tcp.ext-addrs</tt>). */ public static final String ATTR_EXT_ADDRS = "comm.tcp.ext-addrs"; /** Default port which node sets listener to (value is <tt>47100</tt>). */ public static final int DFLT_PORT = 47100; - /** Default port which node sets listener for shared memory connections (value is <tt>48100</tt>). */ - public static final int DFLT_SHMEM_PORT = 48100; - /** Default idle connection timeout (value is <tt>30000</tt>ms). */ public static final long DFLT_IDLE_CONN_TIMEOUT = 30000; @@ -630,9 +615,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** Local port range. */ private int locPortRange = DFLT_PORT_RANGE; - /** Local port which node uses to accept shared memory connections. */ - private int shmemPort = DFLT_SHMEM_PORT; - /** Grid name. */ private String gridName; @@ -680,9 +662,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** NIO server. */ private GridNioServer<Message> nioSrvr; - /** Shared memory server. */ - private IpcSharedMemoryServerEndpoint shmemSrv; - /** {@code TCP_NODELAY} option value for created sockets. */ private boolean tcpNoDelay = DFLT_TCP_NODELAY; @@ -695,9 +674,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** Socket write timeout. */ private long sockWriteTimeout = DFLT_SOCK_WRITE_TIMEOUT; - /** Shared memory accept worker. */ - private ShmemAcceptWorker shmemAcceptWorker; - /** Idle client worker. */ private IdleClientWorker idleClientWorker; @@ -710,9 +686,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** Recovery worker. */ private RecoveryWorker recoveryWorker; - /** Shared memory workers. */ - private final Collection<ShmemWorker> shmemWorkers = new ConcurrentLinkedDeque8<>(); - /** Clients. */ private final ConcurrentMap<UUID, GridCommunicationClient> clients = GridConcurrentFactory.newMap(); @@ -722,9 +695,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter /** Bound port. */ private int boundTcpPort = -1; - /** Bound port for shared memory server. */ - private int boundTcpShmemPort = -1; - /** Count of selectors to use in TCP server. */ private int selectorsCnt = DFLT_SELECTORS_CNT; @@ -807,15 +777,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } /** - * Gets address resolver. - * - * @return Address resolver. - */ - public AddressResolver getAddressResolver() { - return addrRslvr; - } - - /** * Sets local host address for socket binding. Note that one node could have * additional addresses beside the loopback one. This configuration * parameter is optional. @@ -879,25 +840,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } /** - * Sets local port to accept shared memory connections. - * <p> - * If set to {@code -1} shared memory communication will be disabled. - * <p> - * If not provided, default value is {@link #DFLT_SHMEM_PORT}. - * - * @param shmemPort Port number. - */ - @IgniteSpiConfiguration(optional = true) - public void setSharedMemoryPort(int shmemPort) { - this.shmemPort = shmemPort; - } - - /** {@inheritDoc} */ - @Override public int getSharedMemoryPort() { - return shmemPort; - } - - /** * Sets maximum idle connection timeout upon which a connection * to client will be closed. * <p> @@ -1285,7 +1227,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter assertParameter(sockRcvBuf >= 0, "sockRcvBuf >= 0"); assertParameter(sockSndBuf >= 0, "sockSndBuf >= 0"); assertParameter(msgQueueLimit >= 0, "msgQueueLimit >= 0"); - assertParameter(shmemPort > 0 || shmemPort == -1, "shmemPort > 0 || shmemPort == -1"); assertParameter(reconCnt > 0, "reconnectCnt > 0"); assertParameter(selectorsCnt > 0, "selectorsCnt > 0"); assertParameter(minBufferedMsgCnt >= 0, "minBufferedMsgCnt >= 0"); @@ -1312,13 +1253,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } try { - shmemSrv = resetShmemServer(); - } - catch (IgniteCheckedException e) { - U.warn(log, "Failed to start shared memory communication server.", e); - } - - try { // This method potentially resets local port to the value // local node was bound to. nioSrvr = resetNioServer(); @@ -1338,7 +1272,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter createSpiAttributeName(ATTR_ADDRS), addrs.get1(), createSpiAttributeName(ATTR_HOST_NAMES), addrs.get2(), createSpiAttributeName(ATTR_PORT), boundTcpPort, - createSpiAttributeName(ATTR_SHMEM_PORT), boundTcpShmemPort >= 0 ? boundTcpShmemPort : null, createSpiAttributeName(ATTR_EXT_ADDRS), extAddrs); } catch (IOException | IgniteCheckedException e) { @@ -1367,7 +1300,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter log.debug(configInfo("tcpNoDelay", tcpNoDelay)); log.debug(configInfo("sockSndBuf", sockSndBuf)); log.debug(configInfo("sockRcvBuf", sockRcvBuf)); - log.debug(configInfo("shmemPort", shmemPort)); log.debug(configInfo("msgQueueLimit", msgQueueLimit)); log.debug(configInfo("minBufferedMsgCnt", minBufferedMsgCnt)); log.debug(configInfo("bufSizeRatio", bufSizeRatio)); @@ -1390,12 +1322,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter registerMBean(gridName, this, TcpCommunicationSpiMBean.class); - if (shmemSrv != null) { - shmemAcceptWorker = new ShmemAcceptWorker(shmemSrv); - - new IgniteThread(shmemAcceptWorker).start(); - } - nioSrvr.start(); idleClientWorker = new IdleClientWorker(); @@ -1425,10 +1351,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter @Override public void onContextInitialized0(IgniteSpiContext spiCtx) throws IgniteSpiException { spiCtx.registerPort(boundTcpPort, IgnitePortProtocol.TCP); - // SPI can start without shmem port. - if (boundTcpShmemPort > 0) - spiCtx.registerPort(boundTcpShmemPort, IgnitePortProtocol.TCP); - spiCtx.addLocalEventListener(discoLsnr, EVT_NODE_LEFT, EVT_NODE_FAILED); ctxInitLatch.countDown(); @@ -1563,58 +1485,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter ", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx); } - /** - * Creates new shared memory communication server. - * @return Server. - * @throws IgniteCheckedException If failed. - */ - @Nullable private IpcSharedMemoryServerEndpoint resetShmemServer() throws IgniteCheckedException { - if (boundTcpShmemPort >= 0) - throw new IgniteCheckedException("Shared memory server was already created on port " + boundTcpShmemPort); - - if (shmemPort == -1 || U.isWindows()) - return null; - - IgniteCheckedException lastEx = null; - - // If configured TCP port is busy, find first available in range. - for (int port = shmemPort; port < shmemPort + locPortRange; port++) { - try { - IpcSharedMemoryServerEndpoint srv = - new IpcSharedMemoryServerEndpoint(log, ignite.configuration().getNodeId(), gridName); - - srv.setPort(port); - - srv.omitOutOfResourcesWarning(true); - - srv.start(); - - boundTcpShmemPort = port; - - // Ack Port the TCP server was bound to. - if (log.isInfoEnabled()) - log.info("Successfully bound shared memory communication to TCP port [port=" + boundTcpShmemPort + - ", locHost=" + locHost + ']'); - - return srv; - } - catch (IgniteCheckedException e) { - lastEx = e; - - if (log.isDebugEnabled()) - log.debug("Failed to bind to local port (will try next port within range) [port=" + port + - ", locHost=" + locHost + ']'); - - onException("Failed to bind to local port (will try next port within range) [port=" + port + - ", locHost=" + locHost + ']', e); - } - } - - // If free port wasn't found. - throw new IgniteCheckedException("Failed to bind shared memory communication to any port within range [startPort=" + - locPort + ", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx); - } - /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { assert stopping; @@ -1625,9 +1495,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter if (nioSrvr != null) nioSrvr.stop(); - U.cancel(shmemAcceptWorker); - U.join(shmemAcceptWorker, log); - U.interrupt(idleClientWorker); U.interrupt(clientFlushWorker); U.interrupt(sockTimeoutWorker); @@ -1638,11 +1505,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter U.join(sockTimeoutWorker, log); U.join(recoveryWorker, log); - U.cancel(shmemWorkers); - U.join(shmemWorkers, log); - - shmemWorkers.clear(); - // Force closing on stop (safety). for (GridCommunicationClient client : clients.values()) client.forceClose(); @@ -1855,115 +1717,13 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter @Nullable protected GridCommunicationClient createNioClient(ClusterNode node) throws IgniteCheckedException { assert node != null; - Integer shmemPort = node.attribute(createSpiAttributeName(ATTR_SHMEM_PORT)); - - ClusterNode locNode = getSpiContext().localNode(); - - if (locNode == null) + if (getSpiContext().localNode() == null) throw new IgniteCheckedException("Failed to create NIO client (local node is stopping)"); - // If remote node has shared memory server enabled and has the same set of MACs - // then we are likely to run on the same host and shared memory communication could be tried. - if (shmemPort != null && U.sameMacs(locNode, node)) { - try { - return createShmemClient(node, shmemPort); - } - catch (IgniteCheckedException e) { - if (e.hasCause(IpcOutOfSystemResourcesException.class)) - // Has cause or is itself the IpcOutOfSystemResourcesException. - LT.warn(log, null, OUT_OF_RESOURCES_TCP_MSG); - else if (getSpiContext().node(node.id()) != null) - LT.warn(log, null, e.getMessage()); - else { - if (log.isDebugEnabled()) - log.debug("Failed to establish shared memory connection with local node (node has left): " + - node.id()); - - onException("Failed to establish shared memory connection with local node (node has left): " - + node.id(), e); - } - } - } - return createTcpClient(node); } /** - * @param node Node. - * @param port Port. - * @return Client. - * @throws IgniteCheckedException If failed. - */ - @Nullable protected GridCommunicationClient createShmemClient(ClusterNode node, Integer port) throws IgniteCheckedException { - int attempt = 1; - - int connectAttempts = 1; - - long connTimeout0 = connTimeout; - - while (true) { - GridCommunicationClient client; - - try { - client = new GridShmemCommunicationClient(metricsLsnr, port, connTimeout, log, - getSpiContext().messageFormatter()); - } - catch (IgniteCheckedException e) { - // Reconnect for the second time, if connection is not established. - if (connectAttempts < 2 && X.hasCause(e, ConnectException.class)) { - connectAttempts++; - - continue; - } - - throw e; - } - - try { - safeHandshake(client, null, node.id(), connTimeout0); - } - catch (HandshakeTimeoutException e) { - onException("Handshake timedout (will retry with increased timeout) [timeout=" + connTimeout0 + - ", client=" + client + ']', e); - - if (log.isDebugEnabled()) - log.debug("Handshake timedout (will retry with increased timeout) [timeout=" + connTimeout0 + - ", err=" + e.getMessage() + ", client=" + client + ']'); - - client.forceClose(); - - if (attempt == reconCnt || connTimeout0 > maxConnTimeout) { - if (log.isDebugEnabled()) - log.debug("Handshake timedout (will stop attempts to perform the handshake) " + - "[timeout=" + connTimeout0 + ", maxConnTimeout=" + maxConnTimeout + - ", attempt=" + attempt + ", reconCnt=" + reconCnt + - ", err=" + e.getMessage() + ", client=" + client + ']'); - - throw e; - } - else { - attempt++; - - connTimeout0 *= 2; - - continue; - } - } - catch (IgniteCheckedException | RuntimeException | Error e) { - if (log.isDebugEnabled()) - log.debug( - "Caught exception (will close client) [err=" + e.getMessage() + ", client=" + client + ']'); - - client.forceClose(); - - throw e; - } - - return client; - } - } - - /** * Establish TCP connection to remote node and returns client. * * @param node Remote node. @@ -2423,112 +2183,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter } /** - * This worker takes responsibility to shut the server down when stopping, - * No other thread shall stop passed server. - */ - private class ShmemAcceptWorker extends GridWorker { - /** */ - private final IpcSharedMemoryServerEndpoint srv; - - /** - * @param srv Server. - */ - ShmemAcceptWorker(IpcSharedMemoryServerEndpoint srv) { - super(gridName, "shmem-communication-acceptor", log); - - this.srv = srv; - } - - /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException { - try { - while (!Thread.interrupted()) { - ShmemWorker e = new ShmemWorker(srv.accept()); - - shmemWorkers.add(e); - - new IgniteThread(e).start(); - } - } - catch (IgniteCheckedException e) { - if (!isCancelled()) - U.error(log, "Shmem server failed.", e); - } - finally { - srv.close(); - } - } - - /** {@inheritDoc} */ - @Override public void cancel() { - super.cancel(); - - srv.close(); - } - } - - /** - * - */ - private class ShmemWorker extends GridWorker { - /** */ - private final IpcEndpoint endpoint; - - /** - * @param endpoint Endpoint. - */ - private ShmemWorker(IpcEndpoint endpoint) { - super(gridName, "shmem-worker", log); - - this.endpoint = endpoint; - } - - /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException { - try { - GridDirectParser parser = new GridDirectParser(getSpiContext().messageFactory(), - getSpiContext().messageFormatter()); - - IpcToNioAdapter<Message> adapter = new IpcToNioAdapter<>( - metricsLsnr, - log, - endpoint, - srvLsnr, - getSpiContext().messageFormatter(), - new GridNioCodecFilter(parser, log, true), - new GridConnectionBytesVerifyFilter(log) - ); - - adapter.serve(); - } - finally { - shmemWorkers.remove(this); - - endpoint.close(); - } - } - - /** {@inheritDoc} */ - @Override public void cancel() { - super.cancel(); - - endpoint.close(); - } - - /** @{@inheritDoc} */ - @Override protected void cleanup() { - super.cleanup(); - - endpoint.close(); - } - - /** @{@inheritDoc} */ - @Override public String toString() { - return S.toString(ShmemWorker.class, this); - } - } - - /** * */ private class IdleClientWorker extends IgniteSpiThread { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java index 9d44deb..6f3f94d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiMBean.java @@ -44,14 +44,6 @@ public interface TcpCommunicationSpiMBean extends IgniteSpiManagementMBean { public int getLocalPort(); /** - * Gets local port for shared memory communication. - * - * @return Port number. - */ - @MXBeanDescription("Shared memory endpoint port number.") - public int getSharedMemoryPort(); - - /** * Gets maximum number of local ports tried if all previously * tried ports are occupied. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/config/io-manager-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml index 48f420f..9b97407 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -27,7 +27,6 @@ <property name="communicationSpi"> <bean class="org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi"> - <property name="sharedMemoryPort" value="-1"/> <property name="asyncSend" value="true"/> <property name="tcpNoDelay" value="false"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/config/spring-cache-put-remove-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml index 6c7dc90..7d583d7 100644 --- a/modules/core/src/test/config/spring-cache-put-remove-load.xml +++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml @@ -53,12 +53,6 @@ </bean> </property> - <property name="communicationSpi"> - <bean class="org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi"> - <property name="sharedMemoryPort" value="-1"/> - </bean> - </property> - <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java index f0f9761..505697c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java @@ -47,8 +47,6 @@ public abstract class IgniteCacheContainsKeyAbstractSelfTest extends GridCacheAb TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); TransactionConfiguration tcfg = new TransactionConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index f569fa7..16b0515 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -54,12 +54,6 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TestCommunicationSpi commSpi = new TestCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - cfg.setCommunicationSpi(commSpi); - CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setCacheMode(PARTITIONED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java index 89ac933..e2c53a4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java @@ -55,12 +55,6 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cfg1, cfg2, cfg3, cfg4); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - cfg.setCommunicationSpi(commSpi); - return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index 14e89e4..cac3e59 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -454,7 +454,6 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { TcpCommunicationSpi spi = new TcpCommunicationSpi(); spi.setTcpNoDelay(true); - spi.setSharedMemoryPort(-1); spi.setConnectionBufferSize(0); info("Comm SPI: " + spi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index 744635d..ed9e0cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -115,7 +115,6 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { commSpi.setLocalAddress("127.0.0.1"); commSpi.setLocalPort(commLocPort); commSpi.setLocalPortRange(1); - commSpi.setSharedMemoryPort(-1); cfg.setCommunicationSpi(commSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java index 4ba49f9..5c16bfd 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiAbstractTest.java @@ -36,23 +36,10 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica /** */ public static final int IDLE_CONN_TIMEOUT = 2000; - /** */ - private final boolean useShmem; - - /** - * @param useShmem Use shared mem flag. - */ - protected GridTcpCommunicationSpiAbstractTest(boolean useShmem) { - this.useShmem = useShmem; - } - /** {@inheritDoc} */ @Override protected CommunicationSpi getSpi(int idx) { TcpCommunicationSpi spi = new TcpCommunicationSpi(); - if (!useShmem) - spi.setSharedMemoryPort(-1); - spi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); spi.setIdleConnectionTimeout(IDLE_CONN_TIMEOUT); spi.setTcpNoDelay(tcpNoDelay()); @@ -63,9 +50,7 @@ abstract class GridTcpCommunicationSpiAbstractTest extends GridAbstractCommunica /** * @return Value of property '{@link TcpCommunicationSpi#isTcpNoDelay()}'. */ - protected boolean tcpNoDelay() { - return true; - } + protected abstract boolean tcpNoDelay(); /** {@inheritDoc} */ @Override protected int getSpiCount() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index 714eda3..2ccb89d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -296,7 +296,6 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic TcpCommunicationSpi spi = new TcpCommunicationSpi(); spi.setLocalAddress("127.0.0.1"); - spi.setSharedMemoryPort(-1); spi.setLocalPort(port++); spi.setIdleConnectionTimeout(60_000); spi.setConnectTimeout(10_000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java index b4be436..18f8d7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java @@ -37,8 +37,6 @@ public class GridTcpCommunicationSpiConfigSelfTest extends GridSpiAbstractConfig checkNegativeSpiProperty(new TcpCommunicationSpi(), "socketReceiveBuffer", -1); checkNegativeSpiProperty(new TcpCommunicationSpi(), "socketSendBuffer", -1); checkNegativeSpiProperty(new TcpCommunicationSpi(), "messageQueueLimit", -1); - checkNegativeSpiProperty(new TcpCommunicationSpi(), "sharedMemoryPort", 0); - checkNegativeSpiProperty(new TcpCommunicationSpi(), "sharedMemoryPort", -2); checkNegativeSpiProperty(new TcpCommunicationSpi(), "reconnectCount", 0); checkNegativeSpiProperty(new TcpCommunicationSpi(), "selectorsCount", 0); checkNegativeSpiProperty(new TcpCommunicationSpi(), "minimumBufferedMessageCount", -1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java index cc1ca76..03cd4d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.*; * Class for multithreaded {@link TcpCommunicationSpi} test. */ @SuppressWarnings({"JUnitAbstractTestClassNamingConvention"}) -public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridSpiAbstractTest<TcpCommunicationSpi> { +public class GridTcpCommunicationSpiMultithreadedSelfTest extends GridSpiAbstractTest<TcpCommunicationSpi> { /** Connection idle timeout */ public static final int IDLE_CONN_TIMEOUT = 2000; @@ -54,9 +54,6 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS /** Message id sequence. */ private AtomicLong msgId = new AtomicLong(); - /** */ - private final boolean useShmem; - /** SPI resources. */ private static final Collection<IgniteTestResources> spiRsrcs = new ArrayList<>(); @@ -82,12 +79,9 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS } /** - * @param useShmem Use shared mem. */ - protected GridTcpCommunicationSpiMultithreadedSelfTest(boolean useShmem) { + protected GridTcpCommunicationSpiMultithreadedSelfTest() { super(false); - - this.useShmem = useShmem; } /** @@ -418,9 +412,6 @@ public abstract class GridTcpCommunicationSpiMultithreadedSelfTest extends GridS private CommunicationSpi<Message> newCommunicationSpi() { TcpCommunicationSpi spi = new TcpCommunicationSpi(); - if (!useShmem) - spi.setSharedMemoryPort(-1); - spi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); spi.setIdleConnectionTimeout(IDLE_CONN_TIMEOUT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedShmemTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedShmemTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedShmemTest.java deleted file mode 100644 index e609dc4..0000000 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedShmemTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.spi.communication.tcp; - -/** - * - */ -public class GridTcpCommunicationSpiMultithreadedShmemTest extends GridTcpCommunicationSpiMultithreadedSelfTest { - /** */ - public GridTcpCommunicationSpiMultithreadedShmemTest() { - super(false); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedTcpSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedTcpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedTcpSelfTest.java deleted file mode 100644 index 7afe91c..0000000 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedTcpSelfTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.spi.communication.tcp; - -/** - * - */ -public class GridTcpCommunicationSpiMultithreadedTcpSelfTest extends GridTcpCommunicationSpiMultithreadedSelfTest { - /** */ - public GridTcpCommunicationSpiMultithreadedTcpSelfTest() { - super(false); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index 7b64988..f1d0847 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -318,7 +318,6 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationS protected TcpCommunicationSpi getSpi(int ackCnt, int idleTimeout, int queueLimit) { TcpCommunicationSpi spi = new TcpCommunicationSpi(); - spi.setSharedMemoryPort(-1); spi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); spi.setIdleConnectionTimeout(idleTimeout); spi.setTcpNoDelay(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 0c79ca5..1b941f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -608,7 +608,6 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> protected TcpCommunicationSpi getSpi(int idx) { TcpCommunicationSpi spi = new TcpCommunicationSpi(); - spi.setSharedMemoryPort(-1); spi.setLocalPort(port++); spi.setIdleConnectionTimeout(10_000); spi.setConnectTimeout(10_000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java deleted file mode 100644 index 0cdb42d..0000000 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.spi.communication.tcp; - -import org.apache.ignite.testframework.junits.spi.*; - -/** - * - */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") -public class GridTcpCommunicationSpiShmemSelfTest extends GridTcpCommunicationSpiAbstractTest { - /** */ - public GridTcpCommunicationSpiShmemSelfTest() { - super(false); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java index 5ca1194..32bced2 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java @@ -24,8 +24,8 @@ import org.apache.ignite.testframework.junits.spi.*; */ @GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") public class GridTcpCommunicationSpiTcpSelfTest extends GridTcpCommunicationSpiAbstractTest { - /** */ - public GridTcpCommunicationSpiTcpSelfTest() { - super(false); + /** {@inheritDoc} */ + @Override protected boolean tcpNoDelay() { + return true; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java index d813698..13f8515 100644 --- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java +++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java @@ -101,11 +101,6 @@ public class GridCacheStoreValueBytesNode { IgniteConfiguration cfg = new IgniteConfiguration(); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - commSpi.setSharedMemoryPort(-1); - - cfg.setCommunicationSpi(commSpi); - cfg.setDiscoverySpi(discovery()); cfg.setPeerClassLoadingEnabled(p2pEnabled); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java index abaa6e7..1d3bfcd 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java @@ -38,12 +38,10 @@ public class IgniteSpiCommunicationSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(GridTcpCommunicationSpiTcpSelfTest.class)); suite.addTest(new TestSuite(GridTcpCommunicationSpiTcpNoDelayOffSelfTest.class)); - suite.addTest(new TestSuite(GridTcpCommunicationSpiShmemSelfTest.class)); suite.addTest(new TestSuite(GridTcpCommunicationSpiStartStopSelfTest.class)); - suite.addTest(new TestSuite(GridTcpCommunicationSpiMultithreadedTcpSelfTest.class)); - suite.addTest(new TestSuite(GridTcpCommunicationSpiMultithreadedShmemTest.class)); + suite.addTest(new TestSuite(GridTcpCommunicationSpiMultithreadedSelfTest.class)); suite.addTest(new TestSuite(GridTcpCommunicationSpiConfigSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index 04ab706..9c44bfb 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -35,6 +35,13 @@ <artifactId>ignite-hadoop</artifactId> + <repositories> + <repository> + <id>Maven Central Staging</id> + <url>https://oss.sonatype.org/content/repositories/orggridgain-1246</url> + </repository> + </repositories> + <dependencies> <dependency> <groupId>org.apache.ignite</groupId> @@ -96,6 +103,12 @@ </dependency> <dependency> + <groupId>org.gridgain</groupId> + <artifactId>ignite-shmem</artifactId> + <version>RELEASE</version> + </dependency> + + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java index 361d2ff..6f48a13 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java @@ -185,7 +185,6 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA cfg.setFileSystemConfiguration(igfsCfg); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); cfg.setLocalHost(U.getLocalHost().getHostAddress()); - cfg.setCommunicationSpi(communicationSpi()); G.start(cfg); } @@ -211,7 +210,6 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA cfg.setFileSystemConfiguration(igfsConfiguration(gridName)); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); cfg.setLocalHost("127.0.0.1"); - cfg.setCommunicationSpi(communicationSpi()); return cfg; } @@ -273,15 +271,6 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA return cfg; } - /** @return Communication SPI. */ - private CommunicationSpi communicationSpi() { - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - return commSpi; - } - /** {@inheritDoc} */ @Override protected void afterTestsStopped() throws Exception { G.stopAll(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java index 2679e03..09e794b 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java @@ -283,8 +283,6 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra cfg.setFileSystemConfiguration(igfsCfg); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setCommunicationSpi(communicationSpi()); - G.start(cfg); } @@ -320,7 +318,6 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra cfg.setCacheConfiguration(cacheConfiguration()); cfg.setFileSystemConfiguration(fsConfiguration(gridName)); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setCommunicationSpi(communicationSpi()); return cfg; } @@ -380,15 +377,6 @@ public class HadoopSecondaryFileSystemConfigurationTest extends IgfsCommonAbstra return cfg; } - /** @return Communication SPI. */ - private CommunicationSpi communicationSpi() { - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - return commSpi; - } - /** * Case #SecondaryFileSystemProvider(null, path) * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java index 4c59b05..78be16f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java @@ -33,8 +33,6 @@ import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; -import org.apache.ignite.spi.communication.*; -import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -218,8 +216,6 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA cfg.setFileSystemConfiguration(igfsCfg); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setCommunicationSpi(communicationSpi()); - G.start(cfg); } @@ -283,7 +279,6 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA cfg.setCacheConfiguration(cacheConfiguration(gridName)); cfg.setFileSystemConfiguration(igfsConfiguration(gridName)); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setCommunicationSpi(communicationSpi()); return cfg; } @@ -343,15 +338,6 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA return cfg; } - /** @return Communication SPI. */ - private CommunicationSpi communicationSpi() { - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - return commSpi; - } - /** @throws Exception If failed. */ public void testGetUriIfFSIsNotInitialized() throws Exception { GridTestUtils.assertThrows(log, new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java index 6502c93..de33d6f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemHandshakeSelfTest.java @@ -25,7 +25,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.hadoop.fs.v2.*; import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -199,12 +198,6 @@ public class IgniteHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractT cfg.setDiscoverySpi(discoSpi); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - cfg.setCommunicationSpi(commSpi); - CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); metaCacheCfg.setName("replicated"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java index aa1b083..149de95 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.ipc.shmem.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -87,12 +86,6 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - cfg.setCommunicationSpi(commSpi); - cnt++; return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java index 7fda532..af1a1e1 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopAbstractSelfTest.java @@ -94,12 +94,6 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { cfg.setHadoopConfiguration(hadoopConfiguration(gridName)); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); - - commSpi.setSharedMemoryPort(-1); - - cfg.setCommunicationSpi(commSpi); - TcpDiscoverySpi discoSpi = (TcpDiscoverySpi)cfg.getDiscoverySpi(); discoSpi.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/yardstick/config/ignite-base-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index ccb45a7..6c03d4b 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -178,11 +178,5 @@ <property name="perTask" value="false"/> </bean> </property> - - <property name="communicationSpi"> - <bean class="org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi"> - <property name="sharedMemoryPort" value="-1"/> - </bean> - </property> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96742b52/modules/yardstick/config/ignite-store-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-store-config.xml b/modules/yardstick/config/ignite-store-config.xml index fee35eb..9d19df7 100644 --- a/modules/yardstick/config/ignite-store-config.xml +++ b/modules/yardstick/config/ignite-store-config.xml @@ -137,12 +137,6 @@ </bean> </property> - <property name="communicationSpi"> - <bean class="org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi"> - <property name="sharedMemoryPort" value="-1"/> - </bean> - </property> - <property name="localHost" value="127.0.0.1"/> <property name="discoverySpi">
