ignite-1028 (cherry picked from commit 395b320)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70ad5ba7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70ad5ba7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70ad5ba7 Branch: refs/heads/master Commit: 70ad5ba7721e58f0ac18d3c76fd00b3854df4387 Parents: f02fca6 Author: Anton Vinogradov <a...@apache.org> Authored: Fri Sep 11 12:06:32 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Fri Sep 11 14:02:21 2015 +0300 ---------------------------------------------------------------------- .../internal/util/GridSpiCloseableIteratorWrapper.java | 5 +++++ .../processors/cache/GridCacheP2PUndeploySelfTest.java | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/70ad5ba7/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java index 5c76cbd..afc574f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSpiCloseableIteratorWrapper.java @@ -54,4 +54,9 @@ public class GridSpiCloseableIteratorWrapper<T> extends GridCloseableIteratorAda @Override protected void onClose() throws IgniteCheckedException { iter.close(); } + + /** {@inheritDoc} */ + @Override protected void onRemove() throws IgniteCheckedException { + iter.remove(); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/70ad5ba7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java index ba52c2f..2c8c748 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -81,7 +81,11 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { cfg.setMarshaller(new JdkMarshaller()); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); + + swap.setWriteBufferSize(1); + + cfg.setSwapSpaceSpi(swap); CacheConfiguration repCacheCfg = defaultCacheConfiguration(); @@ -233,6 +237,8 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { cache2.localEvict(ImmutableSet.of(2, 3, 4)); + U.sleep(100); //Time to store entries to disk. + long swapSize = size(cacheName, grid2); info("Swap size: " + swapSize);