Repository: ignite Updated Branches: refs/heads/master fe6bbab9a -> 7ae798afe
IGNITE-6963 TotalAllocatedPages metric does not match PhysicalMemoryPages when persistence is disabled Signed-off-by: Anton Vinogradov <a...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ae798af Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ae798af Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ae798af Branch: refs/heads/master Commit: 7ae798afe6eda53e720b7164094ad7679b00e97a Parents: fe6bbab Author: Andrey Kuznetsov <stku...@gmail.com> Authored: Tue Nov 21 16:59:22 2017 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Tue Nov 21 16:59:22 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/persistence/DataRegionMetricsImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7ae798af/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java index 471ac94..ef148ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java @@ -160,7 +160,10 @@ public class DataRegionMetricsImpl implements DataRegionMetrics { /** {@inheritDoc} */ @Override public long getPhysicalMemoryPages() { - if (!metricsEnabled || !persistenceEnabled) + if (!persistenceEnabled) + return getTotalAllocatedPages(); + + if (!metricsEnabled) return 0; assert pageMem != null;
