You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/09/20 14:45:17 UTC

[19/22] ignite git commit: conn

conn


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb58fc4f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb58fc4f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb58fc4f

Branch: refs/heads/ignite-comm-balance
Commit: fb58fc4fd17509a798bedfd02c391411989088e4
Parents: 4030ef8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 20 14:54:25 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 20 15:16:16 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/util/nio/GridNioServer.java |   3 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 115 +++++++++-------
 ...acheConnectionRecovery10ConnectionsTest.java |  35 +++++
 .../IgniteCacheMessageWriteTimeoutTest.java     |   4 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../testsuites/IgniteCacheTestSuite2.java       | 130 +++++++++++++++++--
 6 files changed, 229 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb58fc4f/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 578c73e..83ed513e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -1473,7 +1473,8 @@ public class GridNioServer<T> {
                                     MessageReader reader = ses.meta(GridDirectParser.READER_META_KEY);
 
                                     sb.append("    Connection info [")
-                                        .append("rmtAddr=").append(ses.remoteAddress())
+                                        .append("in=").append(ses.accepted())
+                                        .append(", rmtAddr=").append(ses.remoteAddress())
                                         .append(", locAddr=").append(ses.localAddress());
 
                                     GridNioRecoveryDescriptor outDesc = ses.outRecoveryDescriptor();

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb58fc4f/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 2d1a2b2..ee30420 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
@@ -339,6 +339,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
     /** */
     private ConnectGateway connectGate;
 
+    /** */
+    private ConnectionPolicy connPlc;
+
     /** Server listener. */
     private final GridNioServerListener<Message> srvLsnr =
         new GridNioServerListenerAdapter<Message>() {
@@ -374,7 +377,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                     if (nodeClients != null) {
                         for (GridCommunicationClient client : nodeClients) {
                             if (client instanceof GridTcpNioCommunicationClient &&
-                                ((GridTcpNioCommunicationClient) client).session() == ses) {
+                                ((GridTcpNioCommunicationClient)client).session() == ses) {
                                 client.close();
 
                                 removeNodeClient(id, client);
@@ -1615,6 +1618,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
             nioSrvr.dumpStats();
     }
 
+    /** */
+    private final ThreadLocal<Integer> threadConnIdx = new ThreadLocal<>();
+
+    /** */
+    private final AtomicInteger connIdx = new AtomicInteger();
+
     /** {@inheritDoc} */
     @Override public Map<String, Object> getNodeAttributes() throws IgniteSpiException {
         initFailureDetectionTimeout();
@@ -1649,6 +1658,53 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                 "Specified 'unackedMsgsBufSize' is too low, it should be at least 'ackSndThreshold * 5'.");
         }
 
+        if (connectionsPerNode > 1) {
+            int idxMode = IgniteSystemProperties.getInteger("CONN_IDX_MODE", 0);
+
+            switch (idxMode) {
+                case 0: {
+                    connPlc = new ConnectionPolicy() {
+                        @Override public int connectionIndex() {
+                            return (int)(Thread.currentThread().getId() % connectionsPerNode);
+                        }
+                    };
+
+                    break;
+                }
+
+                case 1: {
+                    connPlc = new ConnectionPolicy() {
+                        @Override public int connectionIndex() {
+                            Integer threadIdx = threadConnIdx.get();
+
+                            if (threadIdx != null)
+                                return threadIdx;
+
+                            for (;;) {
+                                int idx = connIdx.get();
+                                int nextIdx = idx == connectionsPerNode - 1 ? 0 : idx + 1;
+
+                                if (connIdx.compareAndSet(idx, nextIdx)) {
+                                    threadConnIdx.set(idx);
+
+                                    return idx;
+                                }
+                            }
+                        }
+                    };
+
+                    break;
+                }
+            }
+        }
+        else {
+            connPlc = new ConnectionPolicy() {
+                @Override public int connectionIndex() {
+                    return 0;
+                }
+            };
+        }
+
         try {
             locHost = U.resolveLocalHost(locAddr);
         }
@@ -2161,51 +2217,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
         sendMessage0(node, msg, ackC);
     }
 
-    /** */
-    private final int idxMode = IgniteSystemProperties.getInteger("CONN_IDX_MODE", 0);
-
-    /** */
-    private final ThreadLocal<Integer> threadConnIdx = new ThreadLocal<>();
-
-    /** */
-    private final AtomicInteger connIdx = new AtomicInteger();
-
-    /**
-     * TODO
-     * @return
-     */
-    private int connectionIndex() {
-        switch (idxMode) {
-            case 0: {
-                return (int)(Thread.currentThread().getId() % connectionsPerNode);
-            }
-
-            case 1: {
-                Integer threadIdx = threadConnIdx.get();
-
-                if (threadIdx != null)
-                    return threadIdx;
-
-                for (;;) {
-                    int idx = connIdx.get();
-                    int nextIdx = idx == connectionsPerNode - 1 ? 0 : idx + 1;
-
-                    if (connIdx.compareAndSet(idx, nextIdx)) {
-                        threadConnIdx.set(idx);
-
-                        return idx;
-                    }
-                }
-            }
-
-            case 2:
-                return ThreadLocalRandom.current().nextInt(connectionsPerNode);
-
-            default:
-                throw new IgniteException("Invalid connection index mode: " + idxMode);
-        }
-    }
-
     /**
      * @param node Destination node.
      * @param msg Message to send.
@@ -2233,7 +2244,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
         else {
             GridCommunicationClient client = null;
 
-            int connIdx = useMultipleConnections(node) ? connectionIndex() : 0;
+            int connIdx = useMultipleConnections(node) ? connPlc.connectionIndex() : 0;
 
             try {
                 boolean retry;
@@ -4310,4 +4321,14 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
             return S.toString(ConnectionKey.class, this);
         }
     }
+
+    /**
+     *
+     */
+    interface ConnectionPolicy {
+        /**
+         * @return Thread connection index.
+         */
+        int connectionIndex();
+    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb58fc4f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecovery10ConnectionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecovery10ConnectionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecovery10ConnectionsTest.java
new file mode 100644
index 0000000..919aea6
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecovery10ConnectionsTest.java
@@ -0,0 +1,35 @@
+/*
+ * 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.internal.processors.cache.distributed;
+
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+
+/**
+ *
+ */
+public class IgniteCacheConnectionRecovery10ConnectionsTest extends IgniteCacheConnectionRecoveryTest {
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+        ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setConnectionsPerNode(10);
+
+        return cfg;
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb58fc4f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
index 6256225..5b51af8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageWriteTimeoutTest.java
@@ -50,8 +50,8 @@ public class IgniteCacheMessageWriteTimeoutTest extends GridCommonAbstractTest {
         // Try provoke connection close on socket writeTimeout.
         commSpi.setSharedMemoryPort(-1);
         commSpi.setMessageQueueLimit(10);
-        commSpi.setSocketReceiveBuffer(32);
-        commSpi.setSocketSendBuffer(32);
+        commSpi.setSocketReceiveBuffer(40);
+        commSpi.setSocketSendBuffer(40);
         commSpi.setSocketWriteTimeout(100);
         commSpi.setUnacknowledgedMessagesBufferSize(1000);
         commSpi.setConnectTimeout(10_000);

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb58fc4f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 2fd84ab..2ce6e57 100755
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -126,6 +126,7 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheTxNearUpdate
 import org.apache.ignite.internal.processors.cache.distributed.GridCacheEntrySetIterationPreloadingSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheAtomicMessageRecovery10ConnectionsTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheAtomicMessageRecoveryTest;
+import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheConnectionRecovery10ConnectionsTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheConnectionRecoveryTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheMessageRecoveryIdleConnectionTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheMessageWriteTimeoutTest;
@@ -288,6 +289,7 @@ public class IgniteCacheTestSuite extends TestSuite {
         suite.addTestSuite(IgniteCacheMessageWriteTimeoutTest.class);
         suite.addTestSuite(IgniteCacheMessageRecoveryIdleConnectionTest.class);
         suite.addTestSuite(IgniteCacheConnectionRecoveryTest.class);
+        suite.addTestSuite(IgniteCacheConnectionRecovery10ConnectionsTest.class);
         GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredEvictionAtomicSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredEvictionSelfTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, GridCacheOffHeapTieredAtomicSelfTest.class, ignoredTests);

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb58fc4f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index ac50323..dc412a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -43,15 +43,10 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheLockReleaseN
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionNotLoadedEventSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedNearDisabledTxMultiThreadedSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheAtomicMessageRecoveryTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeChangingTopologyTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest;
-import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheConnectionRecoveryTest;
-import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheMessageRecoveryIdleConnectionTest;
-import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheMessageWriteTimeoutTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheNearOffheapGetSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart;
-import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxMessageRecoveryTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheAtomicExpiredEntriesPreloadSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPreloadRestartSelfTest;
@@ -146,11 +141,126 @@ public class IgniteCacheTestSuite2 extends TestSuite {
     public static TestSuite suite() throws Exception {
         TestSuite suite = new TestSuite("IgniteCache Test Suite part 2");
 
-        suite.addTestSuite(IgniteCacheMessageWriteTimeoutTest.class);
-        suite.addTestSuite(IgniteCacheAtomicMessageRecoveryTest.class);
-        suite.addTestSuite(IgniteCacheTxMessageRecoveryTest.class);
-        suite.addTestSuite(IgniteCacheMessageRecoveryIdleConnectionTest.class);
-        suite.addTestSuite(IgniteCacheConnectionRecoveryTest.class);
+        // Local cache.
+        suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
+        suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class);
+        suite.addTestSuite(GridCacheLocalAtomicBasicStoreSelfTest.class);
+        suite.addTestSuite(GridCacheLocalGetAndTransformStoreSelfTest.class);
+        suite.addTestSuite(GridCacheLocalAtomicGetAndTransformStoreSelfTest.class);
+        suite.addTestSuite(GridCacheLocalLoadAllSelfTest.class);
+        suite.addTestSuite(GridCacheLocalLockSelfTest.class);
+        suite.addTestSuite(GridCacheLocalMultithreadedSelfTest.class);
+        suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class);
+        suite.addTestSuite(GridCacheLocalEventSelfTest.class);
+        suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class);
+        suite.addTestSuite(GridCacheVariableTopologySelfTest.class);
+        suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class);
+        suite.addTestSuite(GridCacheTransformEventSelfTest.class);
+        suite.addTestSuite(GridCacheLocalIsolatedNodesSelfTest.class);
+
+        // Partitioned cache.
+        suite.addTestSuite(GridCachePartitionedGetSelfTest.class);
+        suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class));
+        suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class));
+        suite.addTest(new TestSuite(NoneRebalanceModeSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheReplicatedJobExecutionTest.class));
+        suite.addTest(new TestSuite(GridCacheNearOneNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearReaderPreloadSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class));
+        suite.addTest(new TestSuite(RendezvousAffinityFunctionExcludeNeighborsSelfTest.class));
+        suite.addTest(new TestSuite(FairAffinityFunctionExcludeNeighborsSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheRendezvousAffinityClientSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedProjectionAffinitySelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedBasicOpSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedBasicStoreSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedBasicStoreMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedEventSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedLockSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedNearDisabledLockSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedMultiNodeLockSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedMultiThreadedPutGetSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedTxSingleThreadedSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheColocatedTxSingleThreadedSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedTxTimeoutSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheFinishPartitionsSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtEntrySelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtMappingSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadMultiThreadedSelfTest.class));
+        suite.addTest(new TestSuite(CacheDhtLocalPartitionAfterRemoveSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheColocatedPreloadRestartSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearPreloadRestartSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadStartStopSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadUnloadSelfTest.class));
+        suite.addTest(new TestSuite(RendezvousAffinityFunctionBackupFilterSelfTest.class));
+        suite.addTest(new TestSuite(FairAffinityFunctionBackupFilterSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class));
+        suite.addTest(new TestSuite(CacheLoadingConcurrentGridStartSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class));
+        suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class));
+        suite.addTest(new TestSuite(GridCachePartitionedAffinityHashIdResolverSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class));
+        suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class);
+        suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class));
+        suite.addTest(new TestSuite(IgniteCacheNearOffheapGetSelfTest.class));
+
+        suite.addTest(new TestSuite(GridCacheDhtExpiredEntriesPreloadSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class));
+
+        suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class));
+
+        suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class));
+        suite.addTest(new TestSuite(GridCacheColocatedPrimarySyncSelfTest.class));
+
+        suite.addTest(new TestSuite(IgniteCachePartitionMapUpdateTest.class));
+        suite.addTest(new TestSuite(IgniteCacheClientNodePartitionsExchangeTest.class));
+        suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class));
+        suite.addTest(new TestSuite(IgniteCacheServerNodeConcurrentStart.class));
+
+        suite.addTest(new TestSuite(IgniteCacheEntryProcessorNodeJoinTest.class));
+        suite.addTest(new TestSuite(IgniteAtomicCacheEntryProcessorNodeJoinTest.class));
+        suite.addTest(new TestSuite(GridCacheNearTxForceKeyTest.class));
+        suite.addTest(new TestSuite(CrossCacheTxRandomOperationsTest.class));
+        suite.addTest(new TestSuite(IgniteDynamicCacheAndNodeStop.class));
+        suite.addTest(new TestSuite(CacheLockReleaseNodeLeaveTest.class));
+        suite.addTest(new TestSuite(NearCacheSyncUpdateTest.class));
+        suite.addTest(new TestSuite(CacheConfigurationLeakTest.class));
+        suite.addTest(new TestSuite(CacheEnumOperationsSingleNodeTest.class));
+        suite.addTest(new TestSuite(CacheEnumOperationsTest.class));
+        suite.addTest(new TestSuite(IgniteCacheIncrementTxTest.class));
+
+        suite.addTest(new TestSuite(IgniteNoCustomEventsOnNodeStart.class));
 
         return suite;
     }