# ignite-840 try evict partition on data load
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f9a6315 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f9a6315 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f9a6315 Branch: refs/heads/ignite-218 Commit: 9f9a6315524f7500476704ec0321a58f43428fd0 Parents: 31fcc3e Author: sboikov <sboi...@gridgain.com> Authored: Mon Jun 1 10:28:51 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jun 1 10:28:51 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheEntryEx.java | 6 ++++++ .../ignite/internal/processors/cache/GridCacheMapEntry.java | 5 +++++ .../cache/distributed/GridDistributedCacheEntry.java | 7 ------- .../processors/cache/distributed/dht/GridDhtCacheEntry.java | 6 +----- .../internal/processors/datastreamer/DataStreamerImpl.java | 2 ++ .../internal/processors/cache/GridCacheTestEntryEx.java | 4 ++++ .../datastreamer/DataStreamerMultiThreadedSelfTest.java | 2 -- 7 files changed, 18 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index 8d3d089..3857b35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.distributed.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.dr.*; @@ -943,4 +944,9 @@ public interface GridCacheEntryEx { * @return {@code True} if value was removed, {@code false} otherwise. */ public <V> boolean removeMeta(UUID name, V val); + + /** + * Calls {@link GridDhtLocalPartition#onUnlock()} for this entry's partition. + */ + public void onUnlock(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 92035af..03638a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -4100,6 +4100,11 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { } /** {@inheritDoc} */ + @Override public void onUnlock() { + // No-op. + } + + /** {@inheritDoc} */ @Override public boolean equals(Object o) { // Identity comparison left on purpose. return o == this; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java index b79f9d5..bd72764 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java @@ -327,13 +327,6 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry { } /** - * - */ - public void onUnlock() { - // No-op. - } - - /** * Unlocks local lock. * * @return Removed candidate, or <tt>null</tt> if thread still holds the lock. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index c9a7af8..89b85c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -292,12 +292,8 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry { return ret; } - /** - * Calls {@link GridDhtLocalPartition#onUnlock()} for this entry's partition. - */ + /** {@inheritDoc} */ @Override public void onUnlock() { - super.onUnlock(); - locPart.onUnlock(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index db3d350..d16167a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -1422,6 +1422,8 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed cctx.evicts().touch(entry, topVer); CU.unwindEvicts(cctx); + + entry.onUnlock(); } catch (GridDhtInvalidPartitionException | GridCacheEntryRemovedException ignored) { // No-op. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index 9a24109..eaa6e13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -843,4 +843,8 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } + /** {@inheritDoc} */ + @Override public void onUnlock() { + // No-op. + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f9a6315/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java index bea3809..2382a66 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java @@ -68,8 +68,6 @@ public class DataStreamerMultiThreadedSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testStartStopIgnites() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-840";); - for (int attempt = 0; attempt < 3; ++attempt) { log.info("Iteration: " + attempt);
