ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [37/50] [abbrv] ignite git commit: EA3 - Fixing partition eviction
Date Mon, 10 Oct 2016 14:57:42 GMT
EA3 - Fixing partition eviction


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9f45c22
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9f45c22
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9f45c22

Branch: refs/heads/ignite-gg-8-io2-park
Commit: f9f45c22dacfd8e3ce10702a6539279f20dd9185
Parents: d8932da
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Mon Oct 3 16:49:25 2016 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Mon Oct 3 18:35:56 2016 +0300

----------------------------------------------------------------------
 .../database/IgniteCacheDatabaseSharedManager.java  |  4 ++--
 .../distributed/dht/GridDhtLocalPartition.java      | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f9f45c22/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
index 57d9bde..514823e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
@@ -129,7 +129,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
     /**
      *
      */
-    @Nullable public IgniteInternalFuture wakeupForCheckpoint() {
+    @Nullable public IgniteInternalFuture wakeupForCheckpoint(String reason) {
         return null;
     }
 
@@ -138,7 +138,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
      *
      * @throws IgniteCheckedException If failed.
      */
-    public void waitForCheckpoint() throws IgniteCheckedException {
+    public void waitForCheckpoint(String reason) throws IgniteCheckedException {
         // No-op
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f9f45c22/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 5df465e..3782eca 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
@@ -644,20 +644,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
     }
 
     /**
-     *
-     */
-    private void clearPageStore() {
-        try {
-            if (cctx.shared().pageStore() != null)
-                cctx.shared().pageStore().onPartitionDestroyed(cctx.cacheId(), id);
-        }
-        catch (IgniteCheckedException e) {
-            U.error(log, "Failed to gracefully clean resources for evicted partition " +
-                "[cache=" + cctx.name() + ", partId=" + id + ']');
-        }
-    }
-
-    /**
      * @return {@code true} If there is a group reservation.
      */
     boolean groupReserved() {
@@ -743,8 +729,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
 
         ((GridDhtPreloader)cctx.preloader()).onPartitionEvicted(this, updateSeq);
 
-        clearPageStore();
-
         clearDeferredDeletes();
     }
 


Mime
View raw message