You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/29 07:33:53 UTC
[03/12] ignite git commit: Renting primary node - fix.
Renting primary node - fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8de68c68
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8de68c68
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8de68c68
Branch: refs/heads/ignite-5075-pds
Commit: 8de68c68eda96c9e24f3f89fb7bd90202d799502
Parents: e1c825f
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue May 23 18:45:27 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Tue May 23 18:45:27 2017 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 12 +++++++++++-
.../cache/database/GridCacheOffheapManager.java | 2 +-
...nitePersistentStoreCacheRebalancingAbstractTest.java | 2 --
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8de68c68/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index c75b0a2..dbcfeb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1662,8 +1662,18 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
continue;
CounterWithNodes maxCntr = maxCntrs.get(part.id());
+
+ if (maxCntr == null && cntr == 0) {
+ CounterWithNodes cntrObj = new CounterWithNodes(cntr, cctx.localNodeId());
- if (maxCntr == null || cntr > maxCntr.cnt)
+ for (UUID nodeId : msgs.keySet()) {
+ if (top.partitionState(nodeId, part.id()) == GridDhtPartitionState.OWNING)
+ cntrObj.nodes.add(nodeId);
+ }
+
+ maxCntrs.put(part.id(), cntrObj);
+ }
+ else if (maxCntr == null || cntr > maxCntr.cnt)
maxCntrs.put(part.id(), new CounterWithNodes(cntr, cctx.localNodeId()));
else if (cntr == maxCntr.cnt)
maxCntr.nodes.add(cctx.localNodeId());
http://git-wip-us.apache.org/repos/asf/ignite/blob/8de68c68/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
index 1bef00b..9bced42 100644
--- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
+++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
@@ -952,7 +952,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
/** {@inheritDoc} */
@Override public void updateCounter(long val) {
try {
- CacheDataStore delegate0 = init0(true);
+ CacheDataStore delegate0 = init0(false);
if (delegate0 != null)
delegate0.updateCounter(val);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8de68c68/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
index 6aa98af..ecb12f5 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
@@ -362,8 +362,6 @@ public abstract class IgnitePersistentStoreCacheRebalancingAbstractTest extends
* @throws Exception If failed.
*/
public void testTopologyChangesWithConstantLoad() throws Exception {
- fail("only for one run, must be removed soon");
-
final int entriesCnt = 10_000;
int maxNodesCount = 4;
int topChanges = 20;