ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1.6 Increased wait timeout in GridCacheDhtEvictionSelfTest.
Date Wed, 18 May 2016 08:15:10 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.6 83be10584 -> a10b63e91


ignite-1.6 Increased wait timeout in GridCacheDhtEvictionSelfTest.


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

Branch: refs/heads/ignite-1.6
Commit: a10b63e91ddb98c6fdd39b2baaa9884cf3218aeb
Parents: 83be105
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 18 11:12:23 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 18 11:14:55 2016 +0300

----------------------------------------------------------------------
 .../IgniteCacheServerNodeConcurrentStart.java        |  3 +++
 .../dht/GridCacheDhtEvictionSelfTest.java            | 15 ++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a10b63e9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
index a7ba26d..07b346a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheServerNodeConcurrentStart.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed;
 
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
@@ -45,6 +46,8 @@ public class IgniteCacheServerNodeConcurrentStart extends GridCommonAbstractTest
         ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
         ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinderCleanFrequency(getTestTimeout()
* 2);
 
+        ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
         CacheConfiguration ccfg1 = new CacheConfiguration();
 
         ccfg1.setName("cache-1");

http://git-wip-us.apache.org/repos/asf/ignite/blob/a10b63e9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 9516fa4..c55f298 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -249,9 +249,9 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest
{
         // It should trigger dht eviction and eviction on backup node.
         grid(primary).cache(null).localEvict(Collections.<Object>singleton(key));
 
-        // Give 5 seconds for eviction event to occur on backup and primary node.
-        futBackup.get(3000);
-        futPrimary.get(3000);
+        // Give some time for eviction event to occur on backup and primary node.
+        futBackup.get(10_000);
+        futPrimary.get(10_000);
 
         assertEquals(0, nearPrimary.size());
 
@@ -282,9 +282,10 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest
{
 
         Collection<Integer> keys = new ArrayList<>(keyCnt);
 
-        for (int key = 0; keys.size() < keyCnt; key++)
+        for (int key = 0; keys.size() < keyCnt; key++) {
             if (F.eqNodes(primaryIgnite.cluster().localNode(), F.first(keyNodes(key))))
                 keys.add(key++);
+        }
 
         info("Test keys: " + keys);
 
@@ -325,9 +326,9 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest
{
         for (Integer key : keys)
             primaryIgnite.cache(null).localEvict(Collections.<Object>singleton(key));
 
-        // Give 5 seconds for eviction events to occur on backup and primary node.
-        futBackup.get(3000);
-        futPrimary.get(3000);
+        // Give some time for eviction events to occur on backup and primary node.
+        futBackup.get(10_000);
+        futPrimary.get(10_000);
 
         info("nearBackupSize: " + nearBackup.size());
         info("dhtBackupSize: " + dhtBackup.size());


Mime
View raw message