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 2018/03/28 13:31:00 UTC
ignite git commit: IGNITE-8053 Make sure local partitions collection
does not change
Repository: ignite
Updated Branches:
refs/heads/ignite-8053 [created] ad060f108
IGNITE-8053 Make sure local partitions collection does not change
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ad060f10
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ad060f10
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ad060f10
Branch: refs/heads/ignite-8053
Commit: ad060f1084158549089c706eeb36a72752c948a6
Parents: 8bc4886
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Mar 28 16:30:45 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 28 16:30:45 2018 +0300
----------------------------------------------------------------------
.../persistence/GridCacheDatabaseSharedManager.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ad060f10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index 410e9b9..02ae44c 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -128,7 +128,6 @@ import org.apache.ignite.internal.processors.cache.persistence.snapshot.Snapshot
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
import org.apache.ignite.internal.processors.cache.persistence.wal.FileWALPointer;
-import org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager;
import org.apache.ignite.internal.processors.cache.persistence.wal.crc.PureJavaCrc32;
import org.apache.ignite.internal.processors.port.GridPortRecord;
import org.apache.ignite.internal.util.GridMultiCollectionWrapper;
@@ -376,7 +375,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
private List<MetastorageLifecycleListener> metastorageLifecycleLsnrs;
/** Initially disabled cache groups. */
- public Collection<Integer> initiallyWalDisabledGrps;
+ private Collection<Integer> initiallyWalDisabledGrps;
/**
* @param ctx Kernal context.
@@ -3062,14 +3061,14 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
if (grp.isLocal() || !grp.walEnabled())
continue;
- int locPartsSize = 0;
+ ArrayList<GridDhtLocalPartition> parts = new ArrayList<>();
- for (GridDhtLocalPartition ignored : grp.topology().currentLocalPartitions())
- locPartsSize++;
+ for (GridDhtLocalPartition part : grp.topology().currentLocalPartitions())
+ parts.add(part);
- CacheState state = new CacheState(locPartsSize);
+ CacheState state = new CacheState(parts.size());
- for (GridDhtLocalPartition part : grp.topology().currentLocalPartitions()) {
+ for (GridDhtLocalPartition part : parts) {
state.addPartitionState(
part.id(),
part.dataStore().fullSize(),