Repository: ignite Updated Branches: refs/heads/ignite-zk e447de174 -> 6bf14abf0
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bf14abf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bf14abf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bf14abf Branch: refs/heads/ignite-zk Commit: 6bf14abf09ed449adf97b9d7fe34a88a422084a9 Parents: e447de1 Author: sboikov <[email protected]> Authored: Fri Nov 24 17:18:17 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Nov 24 17:18:17 2017 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 3 +- .../zk/internal/ZookeeperClusterNode.java | 29 +++++++++++++++++++- .../zk/internal/ZookeeperDiscoveryImpl.java | 3 +- 3 files changed, 32 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf14abf/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index 8f365c3..3c3ffa7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -324,7 +324,8 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery locNodeVer, locNodeAttrs, consistentId, - ignite.configuration().isClientMode()); + ignite.configuration().isClientMode(), + metricsProvider); locNode.local(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf14abf/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java index b51a556..855d7cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java @@ -68,6 +68,10 @@ public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { @GridToStringExclude private Map<String, Object> attrs; + /** Metrics provider. */ + @GridToStringExclude + private transient DiscoveryMetricsProvider metricsProvider; + /** */ private transient boolean loc; @@ -101,7 +105,8 @@ public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { IgniteProductVersion ver, Map<String, Object> attrs, Serializable consistentId, - boolean client + boolean client, + DiscoveryMetricsProvider metricsProvider ) { assert id != null; assert consistentId != null; @@ -110,6 +115,7 @@ public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { this.ver = ver; this.attrs = U.sealMap(attrs); this.consistentId = consistentId; + this.metricsProvider = metricsProvider; if (client) flags |= CLIENT_NODE_MASK; @@ -152,6 +158,19 @@ public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { /** {@inheritDoc} */ @Override public ClusterMetrics metrics() { + if (metricsProvider != null) { + ClusterMetrics metrics0 = metricsProvider.metrics(); + + assert metrics0 != null; + + metrics = metrics0; + + return metrics0; + } + + if (metrics == null) + System.out.println(); + return metrics; } @@ -164,6 +183,14 @@ public class ZookeeperClusterNode implements IgniteClusterNode, Serializable { /** {@inheritDoc} */ @Override public Map<Integer, CacheMetrics> cacheMetrics() { + if (metricsProvider != null) { + Map<Integer, CacheMetrics> cacheMetrics0 = metricsProvider.cacheMetrics(); + + cacheMetrics = cacheMetrics0; + + return cacheMetrics0; + } + return cacheMetrics; } http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf14abf/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index 74b8a5c..c7b9224 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -1078,7 +1078,6 @@ public class ZookeeperDiscoveryImpl { List<ZookeeperClusterNode> allNodes = dataForJoined.topology(); - // TODO ZK for (int i = 0; i < allNodes.size(); i++) { ZookeeperClusterNode node = allNodes.get(i); @@ -1140,6 +1139,8 @@ public class ZookeeperDiscoveryImpl { joinedNode.order(evtData.topologyVersion()); joinedNode.internalId(evtData.joinedInternalId); + joinedNode.setMetrics(new ClusterMetricsSnapshot()); + top.addNode(joinedNode); List<ClusterNode> topSnapshot = new ArrayList<>((Collection)top.nodesByOrder.values());
