You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/02 15:45:22 UTC

[1/2] incubator-ignite git commit: # IGNITE-709 Delete incorrect test.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709_2 f915629f8 -> 71bf90983


# IGNITE-709 Delete incorrect test.


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

Branch: refs/heads/ignite-709_2
Commit: b09865abc9805fcde980748f818980a8b2bf5ae6
Parents: f915629
Author: sevdokimov <se...@jetbrains.com>
Authored: Fri May 1 15:28:10 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Fri May 1 15:28:10 2015 +0300

----------------------------------------------------------------------
 ...acheTcpClientDiscoveryMultiThreadedTest.java | 29 --------------------
 1 file changed, 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b09865ab/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
index 1abd318..fc7660a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
@@ -161,35 +161,6 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
     /**
      * @throws Exception If failed.
      */
-    public void testCacheWithServerNodesRestart() throws Exception {
-        srvNodesCnt = 1;
-        clientNodesCnt = 1;
-
-        startServerNodes();
-
-        client = true;
-
-        Ignite client = startGrid(srvNodesCnt);
-
-        checkTopology(gridCount());
-
-        IgniteCache<Integer, Integer> cache = client.cache(null);
-
-        performSimpleOperationsOnCache(cache);
-
-        // Restart server nodes, client node should reconnect automatically.
-        stopServerNodes();
-
-        startServerNodes();
-
-        checkTopology(gridCount());
-
-        performSimpleOperationsOnCache(cache);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     private void startServerNodes() throws Exception {
         client = false;
 


[2/2] incubator-ignite git commit: # IGNITE-709 Set timeout for awaitPartitionMapExchange() to avoid tests hanging on TC.

Posted by se...@apache.org.
# IGNITE-709 Set timeout for awaitPartitionMapExchange() to avoid tests hanging on TC.


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

Branch: refs/heads/ignite-709_2
Commit: 71bf909830d6f2340d998de6f358f529d993647c
Parents: b09865a
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat May 2 16:45:12 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat May 2 16:45:12 2015 +0300

----------------------------------------------------------------------
 .../testframework/junits/common/GridCommonAbstractTest.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71bf9098/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 5533897..3c54efe 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -391,6 +391,12 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
                                 if (i == 0)
                                     start = System.currentTimeMillis();
 
+                                if (i >= 50)
+                                    throw new IgniteException("Timeout of waiting for topology map update [grid="
+                                        + g.name() + ", p=" + p + ", nodes=" + exp + ", owners=" + actual +
+                                            ", affNodes=" + affNodes + ", owners=" + owners + ", locNode="
+                                        + g.cluster().localNode().id() + ']');
+
                                 Thread.sleep(200); // Busy wait.
 
                                 continue;