Repository: ignite Updated Branches: refs/heads/ignite-4154-opt2 34ff2dbf2 -> 6e1028bde
ignite-4154 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e1028bd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e1028bd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e1028bd Branch: refs/heads/ignite-4154-opt2 Commit: 6e1028bde13ca94791ac79eb88435f07fce0445c Parents: 34ff2db Author: sboikov <[email protected]> Authored: Wed Nov 16 09:41:46 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 16 09:41:46 2016 +0300 ---------------------------------------------------------------------- .../cache/GridCachePartitionExchangeManager.java | 13 ++++++++++--- .../apache/ignite/spi/discovery/tcp/ServerImpl.java | 3 +-- .../discovery/tcp/internal/TcpDiscoveryStatistics.java | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e1028bd/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 0683c81..a006df5 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 @@ -121,7 +121,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana private static final int EXCHANGE_HISTORY_SIZE = 1000; /** */ - private final boolean skipFirstExchangeMsg = getBoolean("SKIP_FIRST_EXCHANGE_MSG", false); + private boolean skipFirstExchangeMsg; /** Atomic reference for pending timeout object. */ private AtomicReference<ResendTimeoutObject> pendingResend = new AtomicReference<>(); @@ -312,8 +312,15 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana @Override protected void start0() throws IgniteCheckedException { super.start0(); - if (skipFirstExchangeMsg) - cctx.kernalContext().addNodeAttribute("SKIP_FIRST_EXCHANGE_MSG", true); + if (getBoolean("SKIP_FIRST_EXCHANGE_MSG", false)) { + if (cctx.kernalContext().config().isLateAffinityAssignment()) { + skipFirstExchangeMsg = true; + + cctx.kernalContext().addNodeAttribute("SKIP_FIRST_EXCHANGE_MSG", true); + } + else + U.warn(log, "Can not use SKIP_FIRST_EXCHANGE_MSG optimization when late affinity assignment disabled."); + } exchWorker = new ExchangeWorker(); http://git-wip-us.apache.org/repos/asf/ignite/blob/6e1028bd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index af42693..3c5f736 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -6115,8 +6115,7 @@ class ServerImpl extends TcpDiscoveryImpl { } } finally { - if (locNode.order() == 1) - log.info("Close sock [readers=" + spi.stats.socketReaders() + ", msg=" + msg + ", err=" + sockE + ']'); + log.info("Close sock [readers=" + spi.stats.socketReaders() + ", msg=" + msg + ", err=" + sockE + ']'); if (clientMsgWrk != null) { if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/6e1028bd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java index 441aa46..b434c04 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java @@ -691,7 +691,6 @@ public class TcpDiscoveryStatistics { /** {@inheritDoc} */ @Override public synchronized String toString() { - //return "Stats [created=" + sockReadersCreated + ", rmvd=" + sockReadersRmv + ']'; return S.toString(TcpDiscoveryStatistics.class, this); } } \ No newline at end of file
