Repository: ignite Updated Branches: refs/heads/ignite-4154 752c9bed5 -> d2f7e5f3d
ignite-4154 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2f7e5f3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2f7e5f3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2f7e5f3 Branch: refs/heads/ignite-4154 Commit: d2f7e5f3da77613b1d1c7cfe221eb220e9f7872c Parents: 752c9be Author: sboikov <[email protected]> Authored: Thu Nov 10 11:56:59 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Nov 10 11:56:59 2016 +0300 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 36 ++++++++++---------- .../ignite/spi/discovery/tcp/ClientImpl.java | 6 ++++ 2 files changed, 24 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f7e5f3/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 f7f0080..07d1d4c 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 @@ -910,24 +910,24 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana Object affKey) { Integer dupDataCache = null; -// if (compress && affKey != null && !m.containsCache(cacheId)) { -// T2<Integer, GridDhtPartitionFullMap> state0 = dupData.get(affKey); -// -// if (state0 != null && state0.get2().partitionStateEquals(map)) { -// GridDhtPartitionFullMap map0 = new GridDhtPartitionFullMap(map.nodeId(), -// map.nodeOrder(), -// map.updateSequence()); -// -// for (Map.Entry<UUID, GridDhtPartitionMap2> e : map.entrySet()) -// map0.put(e.getKey(), e.getValue().emptyCopy()); -// -// map = map0; -// -// dupDataCache = state0.get1(); -// } -// else -// dupData.put(affKey, new T2<>(cacheId, map)); -// } + if (compress && affKey != null && !m.containsCache(cacheId)) { + T2<Integer, GridDhtPartitionFullMap> state0 = dupData.get(affKey); + + if (state0 != null && state0.get2().partitionStateEquals(map)) { + GridDhtPartitionFullMap map0 = new GridDhtPartitionFullMap(map.nodeId(), + map.nodeOrder(), + map.updateSequence()); + + for (Map.Entry<UUID, GridDhtPartitionMap2> e : map.entrySet()) + map0.put(e.getKey(), e.getValue().emptyCopy()); + + map = map0; + + dupDataCache = state0.get1(); + } + else + dupData.put(affKey, new T2<>(cacheId, map)); + } m.addFullPartitionsMap(cacheId, map, dupDataCache); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f7e5f3/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index f8e38d1..733d204 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -1120,6 +1120,12 @@ class ClientImpl extends TcpDiscoveryImpl { } } } + catch (InterruptedException e) { + if (log.isDebugEnabled()) + log.debug("Client socket writer interrupted."); + + return; + } catch (Exception e) { if (spi.getSpiContext().isStopping()) { if (log.isDebugEnabled())
