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 2017/04/11 13:34:41 UTC
[1/3] ignite git commit: IGNITE-4534: Page eviction rebalance test
fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master 7eb1234cb -> d69a5942d
IGNITE-4534: Page eviction rebalance test fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2068a751
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2068a751
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2068a751
Branch: refs/heads/ignite-3477-master
Commit: 2068a7510b09e193a33ae074b5161f1166399b7e
Parents: 7eb1234
Author: Ivan Rakov <iv...@gmail.com>
Authored: Tue Apr 11 15:24:02 2017 +0300
Committer: Ivan Rakov <iv...@gmail.com>
Committed: Tue Apr 11 15:24:02 2017 +0300
----------------------------------------------------------------------
.../cache/eviction/paged/PageEvictionWithRebalanceTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2068a751/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionWithRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionWithRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionWithRebalanceTest.java
index fd80201..f174908 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionWithRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionWithRebalanceTest.java
@@ -51,11 +51,11 @@ public abstract class PageEvictionWithRebalanceTest extends PageEvictionAbstract
System.out.println(">>> Entries put: " + i);
}
- int size = cache.size(CachePeekMode.PRIMARY);
+ int size = cache.size(CachePeekMode.ALL);
System.out.println(">>> Resulting size: " + size);
- assertTrue(size < ENTRIES);
+ assertTrue(size < ENTRIES * 2); // Primary entries and backups.
for (int i = 3; i >= 1; i--) {
stopGrid(i);
@@ -64,7 +64,7 @@ public abstract class PageEvictionWithRebalanceTest extends PageEvictionAbstract
awaitPartitionMapExchange();
- int rebalanceSize = cache.size(CachePeekMode.PRIMARY);
+ int rebalanceSize = cache.size(CachePeekMode.ALL);
System.out.println(">>> Size after rebalance: " + rebalanceSize);
[3/3] ignite git commit: Merge remote-tracking branch
'community/ignite-3477-master' into ignite-3477-master
Posted by ag...@apache.org.
Merge remote-tracking branch 'community/ignite-3477-master' into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d69a5942
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d69a5942
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d69a5942
Branch: refs/heads/ignite-3477-master
Commit: d69a5942d8926fa6dcae081f70a61b7a2513798e
Parents: 5e5ffe6 2068a75
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Apr 11 15:32:53 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Tue Apr 11 15:32:53 2017 +0300
----------------------------------------------------------------------
.../cache/eviction/paged/PageEvictionWithRebalanceTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] ignite git commit: ignite-3477 : Fixed endless partsToEvict
queue.
Posted by ag...@apache.org.
ignite-3477 : Fixed endless partsToEvict queue.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e5ffe69
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e5ffe69
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e5ffe69
Branch: refs/heads/ignite-3477-master
Commit: 5e5ffe690292a22d7cdffc272e858d7e0d9acc2e
Parents: 7eb1234
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Tue Apr 11 15:32:31 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Tue Apr 11 15:32:31 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtLocalPartition.java | 14 ++++++++------
.../distributed/dht/preloader/GridDhtPreloader.java | 4 ++--
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e5ffe69/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index dbd1948..44fd905 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -217,6 +217,13 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
}
/**
+ * @return {@code True} if partition is marked for transfer to renting state.
+ */
+ public boolean shouldBeRenting() {
+ return shouldBeRenting;
+ }
+
+ /**
* @return Reservations.
*/
public int reservations() {
@@ -458,12 +465,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
if (reservations == 0 && shouldBeRenting)
rent(true);
- try {
- tryEvict();
- }
- catch (NodeStoppingException ignore) {
- // Node is stopping.
- }
+ tryEvictAsync(false);
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e5ffe69/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 9af2388..c033b93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -72,7 +72,7 @@ import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.AFFINITY_POOL;
import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING;
-import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.EVICTED;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.RENTING;
import static org.apache.ignite.internal.util.GridConcurrentFactory.newMap;
/**
@@ -790,7 +790,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
try {
part.tryEvict();
- if (part.state() != EVICTED)
+ if (part.state() == RENTING || part.shouldBeRenting())
partsToEvict.push(part);
}
catch (Throwable ex) {