Skip to content

Commit 77b90b1

Browse files
committed
IGNITE-13770 Fix NPE in Ignite.dataRegionMetrics with empty persistent region - Fixes #8506.
Signed-off-by: Ilya Kasnacheev <ilya.kasnacheev@gmail.com>
1 parent dad79aa commit 77b90b1

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,14 +1829,14 @@ public int activePagesCount() {
18291829

18301830
/** {@inheritDoc} */
18311831
@Override public int checkpointBufferPagesCount() {
1832-
return checkpointPool.size();
1832+
return checkpointPool == null ? 0 : checkpointPool.size();
18331833
}
18341834

18351835
/**
18361836
* Number of used pages in checkpoint buffer.
18371837
*/
18381838
public int checkpointBufferPagesSize() {
1839-
return checkpointPool.pages();
1839+
return checkpointPool == null ? 0 : checkpointPool.pages();
18401840
}
18411841

18421842
/**

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
8989
.setMaxSize(MAX_REGION_SIZE)
9090
.setPersistenceEnabled(true)
9191
.setMetricsEnabled(true))
92+
.setDataRegionConfigurations(
93+
new DataRegionConfiguration()
94+
.setName("EmptyRegion")
95+
.setInitialSize(INIT_REGION_SIZE)
96+
.setMaxSize(MAX_REGION_SIZE)
97+
.setPersistenceEnabled(true)
98+
.setMetricsEnabled(true))
9299
.setCheckpointFrequency(1000);
93100

94101
cfg.setDataStorageConfiguration(memCfg);

0 commit comments

Comments
 (0)