You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2020/12/02 12:06:36 UTC
[ignite] branch master updated: IGNITE-13770 Fix NPE in
Ignite.dataRegionMetrics with empty persistent region - Fixes #8506.
This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 77b90b1 IGNITE-13770 Fix NPE in Ignite.dataRegionMetrics with empty persistent region - Fixes #8506.
77b90b1 is described below
commit 77b90b1431a8e3a611e44497729b271f8059d2dc
Author: Ilya Kasnacheev <il...@gmail.com>
AuthorDate: Wed Dec 2 15:05:55 2020 +0300
IGNITE-13770 Fix NPE in Ignite.dataRegionMetrics with empty persistent region - Fixes #8506.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
.../processors/cache/persistence/pagemem/PageMemoryImpl.java | 4 ++--
.../cache/persistence/db/IgnitePdsDataRegionMetricsTest.java | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
index c6d4d87..b0b28be 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java
@@ -1829,14 +1829,14 @@ public class PageMemoryImpl implements PageMemoryEx {
/** {@inheritDoc} */
@Override public int checkpointBufferPagesCount() {
- return checkpointPool.size();
+ return checkpointPool == null ? 0 : checkpointPool.size();
}
/**
* Number of used pages in checkpoint buffer.
*/
public int checkpointBufferPagesSize() {
- return checkpointPool.pages();
+ return checkpointPool == null ? 0 : checkpointPool.pages();
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
index 3da0c18..63fea44 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
@@ -89,6 +89,13 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
.setMaxSize(MAX_REGION_SIZE)
.setPersistenceEnabled(true)
.setMetricsEnabled(true))
+ .setDataRegionConfigurations(
+ new DataRegionConfiguration()
+ .setName("EmptyRegion")
+ .setInitialSize(INIT_REGION_SIZE)
+ .setMaxSize(MAX_REGION_SIZE)
+ .setPersistenceEnabled(true)
+ .setMetricsEnabled(true))
.setCheckpointFrequency(1000);
cfg.setDataStorageConfiguration(memCfg);