Repository: ignite Updated Branches: refs/heads/ignite-971-1 32c7805c4 -> 606c023bf
ignite-971 Fix swap/unswap. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/606c023b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/606c023b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/606c023b Branch: refs/heads/ignite-971-1 Commit: 606c023bf9a9b1309c5c4041f8dc8bb868ae21ad Parents: 32c7805 Author: sboikov <[email protected]> Authored: Mon Sep 7 13:59:28 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Sep 7 16:21:59 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheSwapManager.java | 2 +- .../cache/distributed/dht/preloader/GridDhtPreloader.java | 5 ++++- .../internal/processors/cache/CacheSwapUnswapGetTest.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/606c023b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index 6a8a11a..7fd6013 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -151,7 +151,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { cctx.cache().metrics0().onOffHeapEvict(); } catch (IgniteCheckedException e) { - log.error("Failed to unmarshal off-heap entry [part=" + part + ", hash=" + hash + ']', e); + U.error(log, "Failed to unmarshal off-heap entry [part=" + part + ", hash=" + hash + ']', e); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/606c023b/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 9c2c28f..36c80a9 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 @@ -381,7 +381,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { if (cctx.isSwapOrOffheapEnabled()) { while (true) { try { - entry = cctx.dht().entryEx(k, true); + entry = cctx.dht().entryEx(k); entry.unswap(); @@ -404,6 +404,9 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { if (info != null && !info.isNew()) res.addInfo(info); + + if (cctx.isSwapOrOffheapEnabled()) + cctx.evicts().touch(entry, msg.topologyVersion()); } else if (log.isDebugEnabled()) log.debug("Key is not present in DHT cache: " + k); http://git-wip-us.apache.org/repos/asf/ignite/blob/606c023b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java index 6af64ca..f44397d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSwapUnswapGetTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.internal.util.typedef.CAX; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.eclipse.jetty.util.ConcurrentHashSet; @@ -57,6 +58,8 @@ public class CacheSwapUnswapGetTest extends GridCommonAbstractTest { ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + return cfg; }
