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 2019/01/11 14:48:49 UTC
[ignite] branch master updated: IGNITE-9290 Remove explicit locks
asynchronously when node left - Fixes #4556.
This is an automated email from the ASF dual-hosted git repository.
agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new a314214 IGNITE-9290 Remove explicit locks asynchronously when node left - Fixes #4556.
a314214 is described below
commit a314214f244be6e67e8bb7be01fda0f03195c696
Author: Andrey V. Mashenkov <an...@gmail.com>
AuthorDate: Fri Jan 11 17:39:42 2019 +0300
IGNITE-9290 Remove explicit locks asynchronously when node left - Fixes #4556.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
---
.../processors/cache/CacheEvictionManager.java | 6 ++--
.../cache/CacheOffheapEvictionManager.java | 5 ++-
.../processors/cache/ExchangeDiscoveryEvents.java | 5 ---
.../processors/cache/GridCacheAdapter.java | 18 +++++------
.../cache/GridCacheConcurrentMapImpl.java | 2 +-
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheEvictionManager.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 20 ++++++------
.../processors/cache/GridCacheMvccManager.java | 36 ++++++++++++----------
.../processors/cache/GridCacheTtlManager.java | 2 +-
.../internal/processors/cache/GridCacheUtils.java | 2 +-
.../cache/distributed/dht/GridDhtCacheAdapter.java | 6 ++--
.../cache/distributed/dht/GridDhtGetFuture.java | 2 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +--
.../distributed/dht/GridPartitionedGetFuture.java | 2 +-
.../dht/GridPartitionedSingleGetFuture.java | 2 +-
.../distributed/dht/atomic/GridDhtAtomicCache.java | 6 ++--
.../dht/colocated/GridDhtColocatedCache.java | 2 +-
.../dht/preloader/GridDhtPartitionDemander.java | 4 +--
.../preloader/GridDhtPartitionsExchangeFuture.java | 7 -----
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../cache/distributed/near/GridNearGetFuture.java | 6 ++--
.../near/GridNearTransactionalCache.java | 6 ++--
.../cache/distributed/near/GridNearTxLocal.java | 10 +++---
.../processors/cache/local/GridLocalCache.java | 2 +-
.../cache/local/atomic/GridLocalAtomicCache.java | 8 ++---
.../processors/cache/mvcc/MvccProcessorImpl.java | 12 +++++---
.../cache/query/GridCacheQueryManager.java | 2 +-
.../processors/datastreamer/DataStreamerImpl.java | 2 +-
.../query/schema/SchemaIndexCacheVisitorImpl.java | 3 +-
.../cache/CacheEntryProcessorCopySelfTest.java | 3 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
.../processors/cache/GridCacheTestEntryEx.java | 4 +--
.../IgniteCacheConfigVariationsFullApiTest.java | 2 +-
.../IgniteCacheClientNodeChangingTopologyTest.java | 2 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 2 +-
37 files changed, 98 insertions(+), 109 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
index b614728..2a9a0e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionManager.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import java.util.Collection;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.jetbrains.annotations.Nullable;
@@ -35,10 +34,9 @@ public interface CacheEvictionManager extends GridCacheManager {
public void touch(IgniteTxEntry txEntry, boolean loc);
/**
- * @param e Entry for eviction policy notification.
- * @param topVer Topology version.
+ * @param e Entry for eviction policy notification.
*/
- public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer);
+ public void touch(GridCacheEntryEx e);
/**
* @param entry Entry to attempt to evict.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
index d737c8b..6813fec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOffheapEvictionManager.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache;
import java.util.Collection;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
@@ -32,11 +31,11 @@ import org.jetbrains.annotations.Nullable;
public class CacheOffheapEvictionManager extends GridCacheManagerAdapter implements CacheEvictionManager {
/** {@inheritDoc} */
@Override public void touch(IgniteTxEntry txEntry, boolean loc) {
- touch(txEntry.cached(), null);
+ touch(txEntry.cached());
}
/** {@inheritDoc} */
- @Override public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer) {
+ @Override public void touch(GridCacheEntryEx e) {
if (e.detached())
return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java
index 1d5d017..23df8d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeDiscoveryEvents.java
@@ -76,11 +76,6 @@ public class ExchangeDiscoveryEvents {
* @param fut Current exchange future.
*/
public void processEvents(GridDhtPartitionsExchangeFuture fut) {
- for (DiscoveryEvent evt : evts) {
- if (evt.type() == EVT_NODE_LEFT || evt.type() == EVT_NODE_FAILED)
- fut.sharedContext().mvcc().removeExplicitNodeLocks(evt.eventNode().id(), fut.initialVersion());
- }
-
if (hasServerLeft())
warnNoAffinityNodes(fut.sharedContext());
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index f0e6cd3..e5a41bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -907,7 +907,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
continue;
}
finally {
- e.touch(null);
+ e.touch();
ctx.shared().database().checkpointReadUnlock();
}
@@ -960,7 +960,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
return e.peek(heap, offheap, AffinityTopologyVersion.NONE, null);
}
finally {
- e.touch(null);
+ e.touch();
}
}
@@ -2114,7 +2114,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
readerArgs);
if (res == null)
- entry.touch(topVer);
+ entry.touch();
}
}
@@ -2129,7 +2129,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
needVer);
if (entry != null && (tx == null || (!tx.implicit() && tx.isolation() == READ_COMMITTED)))
- entry.touch(topVer);
+ entry.touch();
if (keysSize == 1)
// Safe to return because no locks are required in READ_COMMITTED mode.
@@ -2211,7 +2211,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (tx0 == null || (!tx0.implicit() &&
tx0.isolation() == READ_COMMITTED))
- entry.touch(topVer);
+ entry.touch();
break;
}
@@ -2254,7 +2254,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
GridCacheEntryEx entry = peekEx(key);
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
}
}
@@ -2284,7 +2284,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
for (KeyCacheObject key0 : misses.keySet()) {
GridCacheEntryEx entry = peekEx(key0);
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
}
}
@@ -2358,7 +2358,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
entry.clearReserveForLoad(e.getValue().version());
if (needTouch)
- entry.touch(topVer);
+ entry.touch();
}
}
}
@@ -3713,7 +3713,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
log.debug("Got removed entry during loadCache (will ignore): " + entry);
}
finally {
- entry.touch(topVer);
+ entry.touch();
}
CU.unwindEvicts(ctx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 938fd72..3587956 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -204,7 +204,7 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM
true);
if (touch)
- cur.touch(topVer);
+ cur.touch();
}
assert Math.abs(sizeChange) <= 1;
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 8cef176..26da38b 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
@@ -1208,7 +1208,6 @@ public interface GridCacheEntryEx {
/**
* Touch this entry in its context's eviction manager.
*
- * @param topVer Topology version.
*/
- public void touch(AffinityTopologyVersion topVer);
+ public void touch();
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 5a3453a..24c0429 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -23,7 +23,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.eviction.EvictionFilter;
import org.apache.ignite.cache.eviction.EvictionPolicy;
import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
@@ -200,7 +199,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/** {@inheritDoc} */
- @Override public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer) {
+ @Override public void touch(GridCacheEntryEx e) {
assert e.context() == cctx : "Entry from another cache context passed to eviction manager: [" +
"entry=" + e +
", cctx=" + cctx +
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 368e5c4..6a728e0 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
@@ -1070,7 +1070,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
finally {
if (touch)
- touch(cctx.affinity().affinityTopologyVersion());
+ touch();
}
}
@@ -1245,7 +1245,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (lockedByCurrentThread()) {
unlockEntry();
- cctx.evicts().touch(this, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(this);
}
}
@@ -1361,7 +1361,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (lockedByCurrentThread()) {
unlockEntry();
- cctx.evicts().touch(this, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(this);
}
}
@@ -1429,7 +1429,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (lockedByCurrentThread()) {
unlockEntry();
- cctx.evicts().touch(this, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(this);
}
}
@@ -5083,8 +5083,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
/** {@inheritDoc} */
- @Override public void touch(AffinityTopologyVersion topVer) {
- context().evicts().touch(this, topVer);
+ @Override public void touch() {
+ context().evicts().touch(this);
}
/** {@inheritDoc} */
@@ -5284,7 +5284,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (entry.lockedByCurrentThread()) {
entry.unlockEntry();
- cctx.evicts().touch(entry, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(entry);
}
}
@@ -5389,7 +5389,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (entry.lockedByCurrentThread()) {
entry.unlockEntry();
- cctx.evicts().touch(entry, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(entry);
}
}
@@ -5639,7 +5639,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (entry.lockedByCurrentThread()) {
entry.unlockEntry();
- cctx.evicts().touch(entry, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(entry);
}
}
@@ -6839,7 +6839,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (lockedByCurrentThread()) {
unlockEntry();
- cctx.evicts().touch(this, AffinityTopologyVersion.NONE);
+ cctx.evicts().touch(this);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index bd2b58d..32b06a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -260,6 +260,8 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
if (log.isDebugEnabled())
log.debug("Processing node left [nodeId=" + discoEvt.eventNode().id() + "]");
+ removeExplicitNodeLocks(discoEvt.eventNode().id());
+
for (GridCacheFuture<?> fut : activeFutures())
fut.onNodeLeft(discoEvt.eventNode().id());
@@ -351,23 +353,25 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
/**
* @param leftNodeId Left node ID.
- * @param topVer Topology version.
*/
- public void removeExplicitNodeLocks(UUID leftNodeId, AffinityTopologyVersion topVer) {
- for (GridDistributedCacheEntry entry : locked()) {
- try {
- entry.removeExplicitNodeLocks(leftNodeId);
-
- entry.touch(topVer);
- }
- catch (GridCacheEntryRemovedException ignore) {
- if (log.isDebugEnabled())
- log.debug("Attempted to remove node locks from removed entry in mvcc manager " +
- "disco callback (will ignore): " + entry);
- }
-
- cctx.exchange().exchangerUpdateHeartbeat();
- }
+ public void removeExplicitNodeLocks(UUID leftNodeId) {
+ cctx.kernalContext().closure().runLocalSafe(
+ new Runnable() {
+ @Override public void run() {
+ for (GridDistributedCacheEntry entry : locked()) {
+ try {
+ entry.removeExplicitNodeLocks(leftNodeId);
+
+ entry.touch();
+ }
+ catch (GridCacheEntryRemovedException ignore) {
+ if (log.isDebugEnabled())
+ log.debug("Attempted to remove node locks from removed entry in cache lock manager " +
+ "disco callback (will ignore): " + entry);
+ }
+ }
+ }
+ }, true);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index 2166ce5..1a887e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
@@ -71,7 +71,7 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter {
}
if (touch)
- entry.touch(null);
+ entry.touch();
}
};
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index bf1c359..0cca255 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1790,7 +1790,7 @@ public class GridCacheUtils {
}
finally {
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
cctx.shared().database().checkpointReadUnlock();
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 58b12ed..dddd392 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -260,7 +260,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
res.addInfo(info);
}
- entry.touch(msg.topologyVersion());
+ entry.touch();
break;
}
@@ -699,7 +699,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
finally {
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
part.release();
@@ -1232,7 +1232,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
}
finally {
if (entry != null)
- entry.touch(AffinityTopologyVersion.NONE);
+ entry.touch();
}
}
catch (IgniteCheckedException e) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 96d1769..8c754f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -440,7 +440,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
log.debug("Got removed entry when getting a DHT value: " + e);
}
finally {
- e.touch(topVer);
+ e.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
index 8588084..fa15bd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
@@ -388,7 +388,7 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa
log.debug("Got removed entry when getting a DHT value: " + e);
}
finally {
- e.touch(topVer);
+ e.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index dcd7be5..97ef70d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -1647,7 +1647,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
"(added to cancelled locks set): " + req);
}
- entry.touch(ctx.affinity().affinityTopologyVersion());
+ entry.touch();
break;
}
@@ -1833,7 +1833,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (created && entry.markObsolete(dhtVer))
removeEntry(entry);
- entry.touch(topVer);
+ entry.touch();
break;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 55fae44..883ecd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -553,7 +553,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
mvccSnapshot());
}
- entry.touch(topVer);
+ entry.touch();
// Entry was not in memory or in swap, so we remove it from cache.
if (v == null) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 8878414..c5a2bff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -511,7 +511,7 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
mvccSnapshot);
}
- entry.touch(topVer);
+ entry.touch();
// Entry was not in memory or in swap, so we remove it from cache.
if (v == null) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 447f16f..d44dcd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1595,7 +1595,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
finally {
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
}
}
}
@@ -3099,7 +3099,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
for (int i = 0; i < size; i++) {
GridCacheMapEntry entry = locked.get(i);
if (entry != null && (skip == null || !skip.contains(entry.key())))
- entry.touch(topVer);
+ entry.touch();
}
}
@@ -3379,7 +3379,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
finally {
if (entry != null)
- entry.touch(req.topologyVersion());
+ entry.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index a6ac902..76e11d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -659,7 +659,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
}
finally {
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index e970a63..a9ac3ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -925,7 +925,7 @@ public class GridDhtPartitionDemander {
cctx.isDrEnabled() ? DR_PRELOAD : DR_NONE,
false
)) {
- cached.touch(topVer); // Start tracking.
+ cached.touch(); // Start tracking.
if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED) && !cached.isInternal())
cctx.events().addEvent(cached.partition(), cached.key(), cctx.localNodeId(), null,
@@ -933,7 +933,7 @@ public class GridDhtPartitionDemander {
false, null, null, null, true);
}
else {
- cached.touch(topVer); // Start tracking.
+ cached.touch(); // Start tracking.
if (log.isTraceEnabled())
log.trace("Rebalancing entry is already in cache (will ignore) [key=" + cached.key() +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index bce239c..a536011 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1596,9 +1596,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
// Assign to class variable so it will be included into toString() method.
this.partReleaseFut = partReleaseFut;
-
- if (exchId.isLeft())
- cctx.mvcc().removeExplicitNodeLocks(exchId.nodeId(), exchId.topologyVersion());
}
finally {
cctx.exchange().exchangerBlockingSectionEnd();
@@ -1772,8 +1769,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
cctx.exchange().exchangerUpdateHeartbeat();
}
-
- cctx.mvcc().removeExplicitNodeLocks(exchId.nodeId(), exchId.topologyVersion());
}
/**
@@ -4346,8 +4341,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (isDone() || !enterBusy())
return;
- cctx.mvcc().removeExplicitNodeLocks(node.id(), initialVersion());
-
try {
onDiscoveryEvent(new IgniteRunnable() {
@Override public void run() {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 998dcf9..211ae12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -284,7 +284,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
}
finally {
if (entry != null)
- entry.touch(topVer);
+ entry.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 40dbf6a..ca71e60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -455,7 +455,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
}
finally {
if (entry != null && tx == null)
- entry.touch(topVer);
+ entry.touch();
}
}
@@ -560,7 +560,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
if (dhtEntry != null)
// Near cache is enabled, so near entry will be enlisted in the transaction.
// Always touch DHT entry in this case.
- dhtEntry.touch(topVer);
+ dhtEntry.touch();
}
}
}
@@ -705,7 +705,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
entry.releaseEviction();
if (tx == null)
- entry.touch(topVer);
+ entry.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 5cf4755..b978223 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -254,7 +254,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
"(added to cancelled locks set): " + req);
}
- entry.touch(topVer);
+ entry.touch();
}
else if (log.isDebugEnabled())
log.debug("Received unlock request for entry that could not be found: " + req);
@@ -362,7 +362,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
);
if (!req.inTx())
- entry.touch(req.topologyVersion());
+ entry.touch();
}
else {
if (evicted == null)
@@ -595,7 +595,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
if (topVer.equals(AffinityTopologyVersion.NONE))
topVer = ctx.affinity().affinityTopologyVersion();
- entry.touch(topVer);
+ entry.touch();
break;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 7d50947..b918753 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -1418,7 +1418,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
}
}
catch (ClusterTopologyCheckedException e) {
- entry.touch(topologyVersion());
+ entry.touch();
throw e;
}
@@ -1476,7 +1476,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
}
if (readCommitted())
- entry.touch(topologyVersion());
+ entry.touch();
break; // While.
}
@@ -2766,7 +2766,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
}
}
else
- entry.touch(topVer);
+ entry.touch();
}
}
}
@@ -2955,7 +2955,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
GridCacheEntryEx cached0 = txEntry.cached();
if (cached0 != null)
- cached0.touch(topologyVersion());
+ cached0.touch();
}
}
@@ -4556,7 +4556,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
GridCacheEntryEx e = txEntry == null ? entryEx(cacheCtx, txKey, topVer) : txEntry.cached();
if (readCommitted() || skipVals) {
- e.touch(topologyVersion());
+ e.touch();
if (visibleVal != null) {
cacheCtx.addResult(map,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
index 481a6cf..3bdb44e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
@@ -182,7 +182,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> {
if (entry != null && ctx.isAll(entry, CU.empty0())) {
entry.releaseLocal();
- entry.touch(topVer);
+ entry.touch();
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index dc7e3ec..07a6dfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -512,7 +512,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
}
finally {
if (entry != null)
- entry.touch(ctx.affinity().affinityTopologyVersion());
+ entry.touch();
}
if (!success && storeEnabled)
@@ -977,7 +977,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
}
finally {
if (entry != null)
- entry.touch(ctx.affinity().affinityTopologyVersion());
+ entry.touch();
}
}
}
@@ -1508,7 +1508,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
AffinityTopologyVersion topVer = ctx.affinity().affinityTopologyVersion();
for (GridCacheEntryEx entry : locked)
- entry.touch(topVer);
+ entry.touch();
throw new NullPointerException("Null key.");
}
@@ -1525,7 +1525,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
AffinityTopologyVersion topVer = ctx.affinity().affinityTopologyVersion();
for (GridCacheEntryEx entry : locked)
- entry.touch(topVer);
+ entry.touch();
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
index c448620..6621ddb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
@@ -2440,15 +2440,19 @@ public class MvccProcessorImpl extends GridProcessorAdapter implements MvccProce
if (rest.getClass() == ArrayList.class) {
for (MvccDataRow row : ((List<MvccDataRow>) rest))
part.dataStore().updateTxState(cctx, row);
- } else
+ }
+ else
part.dataStore().updateTxState(cctx, (MvccDataRow) rest);
}
- } finally {
+ }
+ finally {
cctx.shared().database().checkpointReadUnlock();
}
- } finally {
+ }
+ finally {
entry.unlockEntry();
- cctx.evicts().touch(entry, AffinityTopologyVersion.NONE);
+
+ cctx.evicts().touch(entry);
metrics.addCleanupNanoTime(System.nanoTime() - cleanupStartNanoTime);
metrics.addCleanupRowsCnt(cleaned);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 8949a2f..7f4699f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -3008,7 +3008,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
val = entry.peek(true, true, topVer, expiryPlc);
- entry.touch(topVer);
+ entry.touch();
break;
}
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 76cb899..5e3a0c8 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
@@ -2286,7 +2286,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
primary ? GridDrType.DR_LOAD : GridDrType.DR_PRELOAD,
false);
- entry.touch(topVer);
+ entry.touch();
CU.unwindEvicts(cctx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/SchemaIndexCacheVisitorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/SchemaIndexCacheVisitorImpl.java
index cb78ff6..d7bc721 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/SchemaIndexCacheVisitorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/SchemaIndexCacheVisitorImpl.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.query.schema;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
@@ -242,7 +241,7 @@ public class SchemaIndexCacheVisitorImpl implements SchemaIndexCacheVisitor {
entry.updateIndex(rowFilter, clo);
}
finally {
- entry.touch(AffinityTopologyVersion.NONE);
+ entry.touch();
}
break;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
index 5c0f3d4..bb293f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
@@ -31,7 +31,6 @@ import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -164,7 +163,7 @@ public class CacheEntryProcessorCopySelfTest extends GridCommonAbstractTest {
CacheObject obj = entry.peekVisibleValue();
- entry.touch(AffinityTopologyVersion.NONE);
+ entry.touch();
int actCnt = cnt.get();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index e0c4a26..6326918 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -6526,7 +6526,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
size++;
- e.touch(null);
+ e.touch();
}
}
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 358dfc3..6e64011 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
@@ -963,7 +963,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
}
/** {@inheritDoc} */
- @Override public void touch(AffinityTopologyVersion topVer) {
- context().evicts().touch(this, topVer);
+ @Override public void touch() {
+ context().evicts().touch(this);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 30357a1..a7a2fdc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -6378,7 +6378,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
size++;
- e.touch(null);
+ e.touch();
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index 0ecefab..2c04d6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -1728,7 +1728,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
}
}
finally {
- entry.touch(entry.context().affinity().affinityTopologyVersion());
+ entry.touch();
}
}
else
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index 7af7cc1..b60cf71 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -368,7 +368,7 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
assertTrue("Invalid backup cache entry: " + dhtEntry, dhtEntry.rawGet() == null);
}
- dhtEntry.touch(null);
+ dhtEntry.touch();
}
/**