Merge into ignite-5072
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26ec9ff5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26ec9ff5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26ec9ff5 Branch: refs/heads/ignite-5072 Commit: 26ec9ff589eaf36d7f149aec302281c28173718d Parents: 9125b90 4ec1b65 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Apr 25 17:43:57 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Apr 25 17:43:57 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheMetrics.java | 7 -- .../configuration/CacheConfiguration.java | 57 +++++------ .../cache/CacheClusterMetricsMXBeanImpl.java | 5 - .../cache/CacheLocalMetricsMXBeanImpl.java | 5 - .../processors/cache/CacheMetricsImpl.java | 5 - .../processors/cache/CacheMetricsSnapshot.java | 13 --- .../IgniteCacheDatabaseSharedManager.java | 19 ++-- .../cache/database/MemoryMetricsImpl.java | 11 +- .../cache/database/MemoryMetricsMXBeanImpl.java | 102 +++++++++++++++++++ .../platform/cache/PlatformCache.java | 1 - .../ignite/mxbean/CacheMetricsMXBean.java | 4 - .../internal/ClusterNodeMetricsSelfTest.java | 2 +- .../platform/PlatformCacheWriteMetricsTask.java | 5 - .../org/apache/ignite/spring/sprint-exclude.xml | 2 - .../frontend/app/data/event-groups.json | 14 --- .../frontend/app/modules/cluster/Cache.js | 4 - .../app/modules/cluster/CacheMetrics.js | 4 - modules/web-console/web-agent/pom.xml | 2 +- .../ignite/console/agent/AgentLauncher.java | 10 +- 19 files changed, 153 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/26ec9ff5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java index 2fa8d99,cfbcd86..ccac7c9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java @@@ -128,8 -125,11 +128,11 @@@ public class IgniteCacheDatabaseSharedM private void registerMetricsMBeans() { IgniteConfiguration cfg = cctx.gridConfig(); - for (MemoryMetrics memMetrics : memMetricsMap.values()) - registerMetricsMBean((MemoryMetricsMXBean)memMetrics, cfg); + for (MemoryMetrics memMetrics : memMetricsMap.values()) { + MemoryPolicyConfiguration memPlcCfg = memPlcMap.get(memMetrics.getName()).config(); + - registerMetricsMBean((MemoryMetricsImpl) memMetrics, memPlcCfg, cfg); ++ registerMetricsMBean((MemoryMetricsImpl)memMetrics, memPlcCfg, cfg); + } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/26ec9ff5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryMetricsImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/26ec9ff5/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java index b447e31,62fb24c..28f2ad5 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java @@@ -111,9 -112,9 +111,9 @@@ public class ClusterNodeMetricsSelfTes final IgniteCache cache = ignite.getOrCreateCache(CACHE_NAME); - MemoryMetrics memMetrics = getDefaultMemoryPolicyMetrics(ignite); + MemoryMetricsImpl memMetrics = getDefaultMemoryPolicyMetrics(ignite); - memMetrics.enableMetrics(); + ((MemoryMetricsImpl)memMetrics).enableMetrics(); int pageSize = getPageSize(ignite);
