Repository: ignite Updated Branches: refs/heads/master 605d946ad -> 3bf880c16
IGNITE-4142: Fixed assertion while update metrics. This closes #1372. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/626f1d56 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/626f1d56 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/626f1d56 Branch: refs/heads/master Commit: 626f1d5614930bca0ab744a6049e5f83f321d46a Parents: 6c38eb2 Author: Andrey V. Mashenkov <[email protected]> Authored: Fri Dec 23 12:18:07 2016 +0300 Committer: Andrey V. Mashenkov <[email protected]> Committed: Mon Jan 9 12:36:41 2017 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/626f1d56/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 8928f28..0f5f741 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 @@ -1920,7 +1920,7 @@ class ClientImpl extends TcpDiscoveryImpl { TcpDiscoveryHeartbeatMessage.MetricsSet metricsSet = e.getValue(); - Map<Integer, CacheMetrics> cacheMetrics = msg.hasCacheMetrics() ? + Map<Integer, CacheMetrics> cacheMetrics = msg.hasCacheMetrics(nodeId) ? msg.cacheMetrics().get(nodeId) : Collections.<Integer, CacheMetrics>emptyMap(); updateMetrics(nodeId, metricsSet.metrics(), cacheMetrics, tstamp); http://git-wip-us.apache.org/repos/asf/ignite/blob/626f1d56/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 204b685..c791333 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 @@ -4927,7 +4927,7 @@ class ServerImpl extends TcpDiscoveryImpl { TcpDiscoveryHeartbeatMessage.MetricsSet metricsSet = e.getValue(); - Map<Integer, CacheMetrics> cacheMetrics = msg.hasCacheMetrics() ? + Map<Integer, CacheMetrics> cacheMetrics = msg.hasCacheMetrics(nodeId) ? msg.cacheMetrics().get(nodeId) : Collections.<Integer, CacheMetrics>emptyMap(); updateMetrics(nodeId, metricsSet.metrics(), cacheMetrics, tstamp);
