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 2015/06/24 15:35:50 UTC
incubator-ignite git commit: # changed timeouts
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-yardstick-client 5d1a2cea3 -> e762044e8
# changed timeouts
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e762044e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e762044e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e762044e
Branch: refs/heads/ignite-yardstick-client
Commit: e762044e82ac876a951630c9d5495e69edc56649
Parents: 5d1a2ce
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 24 16:35:42 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 24 16:35:42 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCachePartitionExchangeManager.java | 6 +++---
.../src/main/java/org/apache/ignite/yardstick/IgniteNode.java | 6 +-----
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e762044e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index edd0ad7..af87685 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -826,7 +826,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
updated |= top.update(null, entry.getValue()) != null;
}
- if (updated)
+ if (!cctx.kernalContext().clientNode() && updated)
refreshPartitions();
}
else
@@ -985,7 +985,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
// If not first preloading and no more topology events present,
// then we periodically refresh partition map.
- if (futQ.isEmpty() && preloadFinished) {
+ if (!cctx.kernalContext().clientNode() && futQ.isEmpty() && preloadFinished) {
refreshPartitions(timeout);
timeout = cctx.gridConfig().getNetworkTimeout();
@@ -1051,7 +1051,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
startEvtFired = true;
- if (changed && futQ.isEmpty())
+ if (!cctx.kernalContext().clientNode() && changed && futQ.isEmpty())
refreshPartitions();
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e762044e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index a04041a..d801322 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -137,7 +137,6 @@ public class IgniteNode implements BenchmarkServer {
commSpi = new TcpCommunicationSpi();
commSpi.setLocalPortRange(200);
- commSpi.setSocketWriteTimeout(30_000);
commSpi.setSharedMemoryPort(-1);
TcpDiscoverySpi spi = (TcpDiscoverySpi)c.getDiscoverySpi();
@@ -145,16 +144,13 @@ public class IgniteNode implements BenchmarkServer {
if (spi == null)
spi = new TcpDiscoverySpi();
- spi.setMaxAckTimeout(100_000);
- spi.setAckTimeout(30_000);
- spi.setNetworkTimeout(30_000);
- spi.setSocketTimeout(30_000);
spi.setJoinTimeout(0);
spi.setMaxMissedClientHeartbeats(50);
spi.setMaxMissedHeartbeats(50);
c.setCommunicationSpi(commSpi);
c.setDiscoverySpi(spi);
+ c.setNetworkTimeout(30_000);
c.setTimeServerPortBase(30000);
c.setTimeServerPortRange(500);