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 12:09:08 UTC
ignite git commit: IGNITE-3477 - Reverted partition evict
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master b62d44646 -> 2a6afe528
IGNITE-3477 - Reverted partition evict
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a6afe52
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a6afe52
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a6afe52
Branch: refs/heads/ignite-3477-master
Commit: 2a6afe5286b105e5e45097391f78e85ec2cd1fde
Parents: b62d446
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 11 15:09:32 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 11 15:09:32 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtLocalPartition.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2a6afe52/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 e8489e2..dbd1948 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
@@ -458,7 +458,12 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
if (reservations == 0 && shouldBeRenting)
rent(true);
- tryEvictAsync(false);
+ try {
+ tryEvict();
+ }
+ catch (NodeStoppingException ignore) {
+ // Node is stopping.
+ }
break;
}