You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2020/06/01 09:12:30 UTC
[ignite] branch master updated: IGNITE-12712 Reorder write throttle
init and segments initialization to fix NPE - Fixes #7463.
This is an automated email from the ASF dual-hosted git repository.
agoncharuk 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 e7d9d99 IGNITE-12712 Reorder write throttle init and segments initialization to fix NPE - Fixes #7463.
e7d9d99 is described below
commit e7d9d9999b7f9bea9a288ae9c2a8556a9f4f2771
Author: Anton Kalashnikov <ka...@yandex.ru>
AuthorDate: Mon Jun 1 12:03:08 2020 +0300
IGNITE-12712 Reorder write throttle init and segments initialization to fix NPE - Fixes #7463.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
---
.../processors/cache/persistence/pagemem/PageMemoryImpl.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 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 a4e3830..2870dcd 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
@@ -68,10 +68,10 @@ import org.apache.ignite.internal.pagemem.wal.record.delta.InitNewPageRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.PageDeltaRecord;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.persistence.CheckpointLockStateChecker;
-import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgress;
import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
import org.apache.ignite.internal.processors.cache.persistence.PageStoreWriter;
import org.apache.ignite.internal.processors.cache.persistence.StorageException;
+import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgress;
import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListMetaIO;
import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
@@ -378,10 +378,10 @@ public class PageMemoryImpl implements PageMemoryEx {
totalTblSize += segments[i].tableSize();
}
- this.segments = segments;
-
initWriteThrottle();
+ this.segments = segments;
+
if (log.isInfoEnabled())
log.info("Started page memory [memoryAllocated=" + U.readableSize(totalAllocated, false) +
", pages=" + pages +
@@ -1167,8 +1167,10 @@ public class PageMemoryImpl implements PageMemoryEx {
if (segments == null)
return;
- for (Segment seg : segments)
- seg.checkpointPages = null;
+ synchronized (segmentsLock) {
+ for (Segment seg : segments)
+ seg.checkpointPages = null;
+ }
if (throttlingPlc != ThrottlingPolicy.DISABLED)
writeThrottle.onFinishCheckpoint();