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 2017/04/10 15:55:41 UTC
[34/53] [abbrv] ignite git commit: ignite-4535 : Removed cache
configuration properties related to synchronous eviction.
ignite-4535 : Removed cache configuration properties related to synchronous eviction.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac872077
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac872077
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac872077
Branch: refs/heads/ignite-3477-master
Commit: ac8720779b44bf32310e1484d7ca91036c9d67ae
Parents: 6ebddae
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Thu Apr 6 17:08:51 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Thu Apr 6 17:08:51 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 151 -------------------
.../configuration/NearCacheConfiguration.java | 1 -
.../processors/cache/GridCacheAttributes.java | 14 --
.../cache/GridCacheEvictionManager.java | 18 ---
.../processors/cache/GridCacheProcessor.java | 13 +-
.../utils/PlatformConfigurationUtils.java | 10 --
.../cache/VisorCacheEvictionConfiguration.java | 55 -------
.../cache/GridCachePartitionedGetSelfTest.java | 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 3 -
...gniteCacheLoadRebalanceEvictionSelfTest.java | 1 -
...gniteCacheP2pUnmarshallingNearErrorTest.java | 3 -
...tractPartitionedByteArrayValuesSelfTest.java | 1 -
...eColocatedOptimisticTransactionSelfTest.java | 1 -
...GridCacheDhtEvictionNearReadersSelfTest.java | 5 -
.../dht/GridCacheDhtEvictionSelfTest.java | 5 -
.../near/GridCacheNearReadersSelfTest.java | 1 -
.../GridCachePartitionedFullApiSelfTest.java | 2 -
...stractReplicatedByteArrayValuesSelfTest.java | 1 -
.../GridCacheReplicatedEvictionSelfTest.java | 135 -----------------
.../cache/eviction/EvictionAbstractTest.java | 34 -----
.../GridCacheEmptyEntriesAbstractSelfTest.java | 1 -
.../SortedEvictionPolicyPerformanceTest.java | 1 -
.../GridCacheLocalByteArrayValuesSelfTest.java | 1 -
.../DataStreamProcessorSelfTest.java | 2 -
.../GridCachePartitionedAtomicLongLoadTest.java | 1 -
.../testsuites/IgniteCacheTestSuite2.java | 2 -
.../cache/GridCacheOffheapIndexGetSelfTest.java | 2 -
.../commands/cache/VisorCacheCommand.scala | 5 -
28 files changed, 1 insertion(+), 469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 383a2a6..4f8f3cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -148,9 +148,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default maximum eviction queue ratio. */
public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
- /** Default eviction key buffer size for batching synchronized evicts. */
- public static final int DFLT_EVICT_KEY_BUFFER_SIZE = 1024;
-
/** Default synchronous eviction timeout in milliseconds. */
public static final long DFLT_EVICT_SYNCHRONIZED_TIMEOUT = 10000;
@@ -234,21 +231,9 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** */
private boolean onheapCache;
- /** Eviction key buffer size. */
- private int evictKeyBufSize = DFLT_EVICT_KEY_BUFFER_SIZE;
-
- /** Synchronous eviction concurrency level. */
- private int evictSyncConcurrencyLvl = DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL;
-
- /** Synchronous eviction timeout. */
- private long evictSyncTimeout = DFLT_EVICT_SYNCHRONIZED_TIMEOUT;
-
/** Eviction filter. */
private EvictionFilter<?, ?> evictFilter;
- /** Maximum eviction overflow ratio. */
- private float evictMaxOverflowRatio = DFLT_MAX_EVICTION_OVERFLOW_RATIO;
-
/** Eager ttl flag. */
private boolean eagerTtl = DFLT_EAGER_TTL;
@@ -437,11 +422,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
dfltLockTimeout = cc.getDefaultLockTimeout();
eagerTtl = cc.isEagerTtl();
evictFilter = cc.getEvictionFilter();
- evictKeyBufSize = cc.getEvictSynchronizedKeyBufferSize();
- evictMaxOverflowRatio = cc.getEvictMaxOverflowRatio();
evictPlc = cc.getEvictionPolicy();
- evictSyncConcurrencyLvl = cc.getEvictSynchronizedConcurrencyLevel();
- evictSyncTimeout = cc.getEvictSynchronizedTimeout();
expiryPolicyFactory = cc.getExpiryPolicyFactory();
indexedTypes = cc.getIndexedTypes();
interceptor = cc.getInterceptor();
@@ -633,138 +614,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
return this;
}
- public boolean isEvictSynchronized() {
- return false;
- }
-
- /**
- * Sets flag indicating whether eviction is synchronized with backup nodes or near caches
- * (or the rest of the nodes for replicated cache).
- *
- * @param evictSync {@code true} if synchronized, {@code false} if not.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronized(boolean evictSync) {
-// this.evictSync = evictSync;
-
- return this;
- }
-
- /**
- * Gets size of the key buffer for synchronized evictions.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_KEY_BUFFER_SIZE}.
- *
- * @return Eviction key buffer size.
- */
- public int getEvictSynchronizedKeyBufferSize() {
- return evictKeyBufSize;
- }
-
- /**
- * Sets eviction key buffer size.
- *
- * @param evictKeyBufSize Eviction key buffer size.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronizedKeyBufferSize(int evictKeyBufSize) {
- this.evictKeyBufSize = evictKeyBufSize;
-
- return this;
- }
-
- /**
- * Gets concurrency level for synchronized evictions. This flag only makes sense
- * with {@link #isEvictSynchronized()} set
- * to {@code true}. When synchronized evictions are enabled, it is possible that
- * local eviction policy will try to evict entries faster than evictions can be
- * synchronized with backup or near nodes. This value specifies how many concurrent
- * synchronous eviction sessions should be allowed before the system is forced to
- * wait and let synchronous evictions catch up with the eviction policy.
- * <p>
- * Note that if synchronous evictions start lagging, it is possible that you have either
- * too big or too small eviction key buffer size or small eviction timeout. In that case
- * you will need to adjust {@link #getEvictSynchronizedKeyBufferSize} or
- * {@link #getEvictSynchronizedTimeout()} values as well.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_CONCURRENCY_LEVEL}.
- *
- * @return Synchronous eviction concurrency level.
- */
- public int getEvictSynchronizedConcurrencyLevel() {
- return evictSyncConcurrencyLvl;
- }
-
- /**
- * Sets concurrency level for synchronized evictions.
- *
- * @param evictSyncConcurrencyLvl Concurrency level for synchronized evictions.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronizedConcurrencyLevel(int evictSyncConcurrencyLvl) {
- this.evictSyncConcurrencyLvl = evictSyncConcurrencyLvl;
-
- return this;
- }
-
- /**
- * Gets timeout for synchronized evictions.
- * <p>
- * Node that initiates eviction waits for responses
- * from remote nodes within this timeout.
- * <p>
- * Default value is defined by {@link #DFLT_EVICT_SYNCHRONIZED_TIMEOUT}.
- *
- * @return Synchronous eviction timeout.
- */
- public long getEvictSynchronizedTimeout() {
- return evictSyncTimeout;
- }
-
- /**
- * Sets timeout for synchronized evictions.
- *
- * @param evictSyncTimeout Timeout for synchronized evictions.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictSynchronizedTimeout(long evictSyncTimeout) {
- this.evictSyncTimeout = evictSyncTimeout;
-
- return this;
- }
-
- /**
- * This value denotes the maximum size of eviction queue in percents of cache
- * size in case of distributed cache (replicated and partitioned) and using
- * synchronized eviction (that is if {@link #isEvictSynchronized()} returns
- * {@code true}).
- * <p>
- * That queue is used internally as a buffer to decrease network costs for
- * synchronized eviction. Once queue size reaches specified value all required
- * requests for all entries in the queue are sent to remote nodes and the queue
- * is cleared.
- * <p>
- * Default value is defined by {@link #DFLT_MAX_EVICTION_OVERFLOW_RATIO} and
- * equals to {@code 10%}.
- *
- * @return Maximum size of eviction queue in percents of cache size.
- */
- public float getEvictMaxOverflowRatio() {
- return evictMaxOverflowRatio;
- }
-
- /**
- * Sets maximum eviction overflow ratio.
- *
- * @param evictMaxOverflowRatio Maximum eviction overflow ratio.
- * @return {@code this} for chaining.
- */
- public CacheConfiguration<K, V> setEvictMaxOverflowRatio(float evictMaxOverflowRatio) {
- this.evictMaxOverflowRatio = evictMaxOverflowRatio;
-
- return this;
- }
-
/**
* Gets eviction filter to specify which entries should not be evicted
* (except explicit evict by calling {@link IgniteCache#localEvict(Collection)}).
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
index 7c948dc..0fc94655 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
@@ -71,7 +71,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
*
* @return Near eviction policy.
* @see CacheConfiguration#getEvictionPolicy()
- * @see CacheConfiguration#isEvictSynchronized()
*/
public EvictionPolicy<K, V> getNearEvictionPolicy() {
return nearEvictPlc;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 42a9cfe..292ea4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -205,20 +205,6 @@ public class GridCacheAttributes implements Serializable {
}
/**
- * @return Flag indicating whether eviction is synchronized.
- */
- public boolean evictSynchronized() {
- return ccfg.isEvictSynchronized();
- }
-
- /**
- * @return Maximum eviction overflow ratio.
- */
- public float evictMaxOverflowRatio() {
- return ccfg.getEvictMaxOverflowRatio();
- }
-
- /**
* @return Default lock timeout.
*/
public long defaultLockTimeout() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
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 4294578..27d628b 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
@@ -132,12 +132,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
filter = cfg.getEvictionFilter();
- if (cfg.getEvictMaxOverflowRatio() < 0)
- throw new IgniteCheckedException("Configuration parameter 'maxEvictOverflowRatio' cannot be negative.");
-
- if (cfg.getEvictSynchronizedKeyBufferSize() < 0)
- throw new IgniteCheckedException("Configuration parameter 'evictSynchronizedKeyBufferSize' cannot be negative.");
-
if (log.isDebugEnabled())
log.debug("Eviction manager started on node: " + cctx.nodeId());
}
@@ -559,18 +553,6 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter implements
}
/**
- * @return Max queue size.
- */
- private int maxQueueSize() {
- int size = (int)(cctx.cache().size() * cctx.config().getEvictMaxOverflowRatio()) / 100;
-
- if (size <= 0)
- size = 500;
-
- return Math.min(size, cctx.config().getEvictSynchronizedKeyBufferSize());
- }
-
- /**
* @param info Eviction info.
* @return Version aware filter.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 987c0c3..c771e54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -342,11 +342,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
String msg = "Disable eviction policy (remove from configuration)";
- if (cfg.getEvictionPolicy() != null) {
+ if (cfg.getEvictionPolicy() != null)
perf.add(msg, false);
-
- perf.add("Disable synchronized evictions (set 'evictSynchronized' to false)", !cfg.isEvictSynchronized());
- }
else
perf.add(msg, true);
@@ -3308,15 +3305,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
"Write behind flush thread count", locAttr.writeBehindFlushThreadCount(),
rmtAttr.writeBehindFlushThreadCount(), false);
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "evictMaxOverflowRatio",
- "Eviction max overflow ratio", locAttr.evictMaxOverflowRatio(),
- rmtAttr.evictMaxOverflowRatio(), true);
-
if (locAttr.cacheMode() == PARTITIONED) {
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "evictSynchronized",
- "Eviction synchronized", locAttr.evictSynchronized(), rmtAttr.evictSynchronized(),
- true);
-
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "nearEvictionPolicy",
"Near eviction policy", locAttr.nearEvictionPolicyClassName(),
rmtAttr.nearEvictionPolicyClassName(), false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index f8709ed..c477e9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -145,17 +145,12 @@ public class PlatformConfigurationUtils {
ccfg.setCacheMode(CacheMode.fromOrdinal(in.readInt()));
ccfg.setCopyOnRead(in.readBoolean());
ccfg.setEagerTtl(in.readBoolean());
- ccfg.setEvictSynchronized(in.readBoolean());
- ccfg.setEvictSynchronizedConcurrencyLevel(in.readInt());
- ccfg.setEvictSynchronizedKeyBufferSize(in.readInt());
- ccfg.setEvictSynchronizedTimeout(in.readLong());
ccfg.setInvalidate(in.readBoolean());
ccfg.setStoreKeepBinary(in.readBoolean());
ccfg.setLoadPreviousValue(in.readBoolean());
ccfg.setDefaultLockTimeout(in.readLong());
ccfg.setLongQueryWarningTimeout(in.readLong());
ccfg.setMaxConcurrentAsyncOperations(in.readInt());
- ccfg.setEvictMaxOverflowRatio(in.readFloat());
ccfg.setName(in.readString());
ccfg.setReadFromBackup(in.readBoolean());
ccfg.setRebalanceBatchSize(in.readInt());
@@ -774,17 +769,12 @@ public class PlatformConfigurationUtils {
writeEnumInt(writer, ccfg.getCacheMode(), CacheConfiguration.DFLT_CACHE_MODE);
writer.writeBoolean(ccfg.isCopyOnRead());
writer.writeBoolean(ccfg.isEagerTtl());
- writer.writeBoolean(ccfg.isEvictSynchronized());
- writer.writeInt(ccfg.getEvictSynchronizedConcurrencyLevel());
- writer.writeInt(ccfg.getEvictSynchronizedKeyBufferSize());
- writer.writeLong(ccfg.getEvictSynchronizedTimeout());
writer.writeBoolean(ccfg.isInvalidate());
writer.writeBoolean(ccfg.isStoreKeepBinary());
writer.writeBoolean(ccfg.isLoadPreviousValue());
writer.writeLong(ccfg.getDefaultLockTimeout());
writer.writeLong(ccfg.getLongQueryWarningTimeout());
writer.writeInt(ccfg.getMaxConcurrentAsyncOperations());
- writer.writeFloat(ccfg.getEvictMaxOverflowRatio());
writer.writeString(ccfg.getName());
writer.writeBoolean(ccfg.isReadFromBackup());
writer.writeInt(ccfg.getRebalanceBatchSize());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
index 05d5c38..b6f72c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
@@ -43,21 +43,6 @@ public class VisorCacheEvictionConfiguration implements Serializable, LessNaming
/** Eviction filter to specify which entries should not be evicted. */
private String filter;
- /** Synchronous eviction concurrency level. */
- private int syncConcurrencyLvl;
-
- /** Synchronous eviction timeout. */
- private long syncTimeout;
-
- /** Synchronized key buffer size. */
- private int syncKeyBufSize;
-
- /** Synchronous evicts flag. */
- private boolean evictSynchronized;
-
- /** Eviction max overflow ratio. */
- private float maxOverflowRatio;
-
/**
* @param ccfg Cache configuration.
* @return Data transfer object for eviction configuration properties.
@@ -70,11 +55,6 @@ public class VisorCacheEvictionConfiguration implements Serializable, LessNaming
cfg.plc = compactClass(plc);
cfg.plcMaxSize = evictionPolicyMaxSize(plc);
cfg.filter = compactClass(ccfg.getEvictionFilter());
- cfg.syncConcurrencyLvl = ccfg.getEvictSynchronizedConcurrencyLevel();
- cfg.syncTimeout = ccfg.getEvictSynchronizedTimeout();
- cfg.syncKeyBufSize = ccfg.getEvictSynchronizedKeyBufferSize();
- cfg.evictSynchronized = ccfg.isEvictSynchronized();
- cfg.maxOverflowRatio = ccfg.getEvictMaxOverflowRatio();
return cfg;
}
@@ -100,41 +80,6 @@ public class VisorCacheEvictionConfiguration implements Serializable, LessNaming
return filter;
}
- /**
- * @return synchronized eviction concurrency level.
- */
- public int synchronizedConcurrencyLevel() {
- return syncConcurrencyLvl;
- }
-
- /**
- * @return synchronized eviction timeout.
- */
- public long synchronizedTimeout() {
- return syncTimeout;
- }
-
- /**
- * @return Synchronized key buffer size.
- */
- public int synchronizedKeyBufferSize() {
- return syncKeyBufSize;
- }
-
- /**
- * @return Synchronous evicts flag.
- */
- public boolean evictSynchronized() {
- return evictSynchronized;
- }
-
- /**
- * @return Eviction max overflow ratio.
- */
- public float maxOverflowRatio() {
- return maxOverflowRatio;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorCacheEvictionConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index fab05df..81f22d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -90,7 +90,6 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
cc.setBackups(1);
cc.setRebalanceMode(SYNC);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
cc.setNearConfiguration(null);
return cc;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
index 78a92cb..82d9b41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java
@@ -81,10 +81,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
partCacheCfg.setAffinity(new GridCacheModuloAffinityFunction(1, 1));
partCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
partCacheCfg.setNearConfiguration(null);
- partCacheCfg.setEvictSynchronized(true);
partCacheCfg.setEvictionPolicy(null);
- partCacheCfg.setEvictSynchronizedKeyBufferSize(25);
- partCacheCfg.setEvictMaxOverflowRatio(0.99f);
partCacheCfg.setRebalanceMode(ASYNC);
partCacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
index bf8c416..3c50043 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java
@@ -75,7 +75,6 @@ public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstract
CacheConfiguration<String, byte[]> cacheCfg = new CacheConfiguration<>();
cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
- cacheCfg.setEvictSynchronized(false);
cacheCfg.setCacheMode(CacheMode.PARTITIONED);
cacheCfg.setBackups(1);
cacheCfg.setReadFromBackup(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
index 87d852f..a4a831f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
@@ -35,9 +35,6 @@ public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnma
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
if (cfg.isClientMode() == null || !cfg.isClientMode()) {
- cfg.getCacheConfiguration()[0].setEvictMaxOverflowRatio(0);
- cfg.getCacheConfiguration()[0].setEvictSynchronized(true);
- cfg.getCacheConfiguration()[0].setEvictSynchronizedKeyBufferSize(1);
cfg.getCacheConfiguration()[0].setEvictionPolicy(new FifoEvictionPolicy(1));
cfg.getCacheConfiguration()[0].setOnheapCacheEnabled(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
index a1ee7cc..16ebf7e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java
@@ -53,7 +53,6 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend
cfg.setNearConfiguration(nearConfiguration());
cfg.setBackups(1);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setEvictSynchronized(false);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
index f056825..e32d4a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
@@ -77,7 +77,6 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA
cc.setNearConfiguration(null);
cc.setBackups(1);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
c.setDiscoverySpi(disco);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index 834861e..20162a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -76,15 +76,10 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setEvictSynchronized(true);
cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setBackups(1);
- // Set eviction queue size explicitly.
- cacheCfg.setEvictSynchronizedKeyBufferSize(1);
- cacheCfg.setEvictMaxOverflowRatio(0);
-
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxSize(10);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
index 64baf84..69aab3e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
@@ -77,7 +77,6 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setRebalanceMode(NONE);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setEvictSynchronized(true);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setBackups(1);
@@ -89,10 +88,6 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
nearCfg.setNearEvictionPolicy(nearPlc);
cacheCfg.setNearConfiguration(nearCfg);
- // Set eviction queue size explicitly.
- cacheCfg.setEvictMaxOverflowRatio(0);
- cacheCfg.setEvictSynchronizedKeyBufferSize(1);
-
FifoEvictionPolicy plc = new FifoEvictionPolicy();
plc.setMaxSize(10000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index faf9ba2..6f7ff65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -82,7 +82,6 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
cacheCfg.setRebalanceMode(NONE);
cacheCfg.setAffinity(aff);
- cacheCfg.setEvictSynchronized(true);
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setBackups(aff.backups());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
index 5aad5a6..b790975 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
@@ -51,8 +51,6 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp
@Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
- cfg.setEvictSynchronized(false);
-
cfg.setAtomicityMode(atomicityMode());
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
index bbd5bf7..b4e58fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java
@@ -46,7 +46,6 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends
cfg.setCacheMode(REPLICATED);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setEvictSynchronized(false);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
deleted file mode 100644
index 4233244..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.replicated;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.UUID;
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-import org.apache.ignite.internal.util.typedef.P1;
-import org.apache.ignite.internal.util.typedef.PA;
-import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.testframework.GridTestUtils;
-
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
-
-/**
- * Tests synchronous eviction for replicated cache.
- */
-public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 4;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return REPLICATED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception {
- CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName);
-
- ccfg.setEvictSynchronized(true);
- ccfg.setEvictSynchronizedKeyBufferSize(1);
-
- return ccfg;
- }
-
- /** {@inheritDoc} */
- @Override protected NearCacheConfiguration nearConfiguration() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override protected boolean swapEnabled() {
- return false;
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testEvictSynchronized() throws Exception {
- final int KEYS = 10;
-
- for (int i = 0; i < KEYS; i++)
- jcache(0).put(String.valueOf(i), i);
-
- for (int g = 0 ; g < gridCount(); g++) {
- for (int i = 0; i < KEYS; i++)
- assertNotNull(jcache(g).localPeek(String.valueOf(i)));
- }
-
- Collection<IgniteFuture<Event>> futs = new ArrayList<>();
-
- for (int g = 0 ; g < gridCount(); g++)
- futs.add(waitForLocalEvent(grid(g).events(), nodeEvent(grid(g).localNode().id()), EVT_CACHE_ENTRY_EVICTED));
-
- for (int g = 0; g < gridCount(); g++) {
- for (int i = 0; i < KEYS; i++) {
- if (grid(g).affinity(null).isPrimary(grid(g).localNode(), String.valueOf(i)))
- jcache(g).localEvict(Collections.singleton(String.valueOf(i)));
- }
- }
-
- for (IgniteFuture<Event> fut : futs)
- fut.get(3000);
-
- boolean evicted = GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- for (int g = 0 ; g < gridCount(); g++) {
- for (int i = 0; i < KEYS; i++) {
- if (jcache(g).localPeek(String.valueOf(i)) != null) {
- log.info("Non-null value, will wait [grid=" + g + ", key=" + i + ']');
-
- return false;
- }
- }
- }
-
- return true;
- }
- }, 3000);
-
- assertTrue(evicted);
- }
-
- /**
- * @param nodeId Node id.
- * @return Predicate for events belonging to specified node.
- */
- private IgnitePredicate<Event> nodeEvent(final UUID nodeId) {
- assert nodeId != null;
-
- return new P1<Event>() {
- @Override public boolean apply(Event e) {
- info("Predicate called [e.nodeId()=" + e.node().id() + ", nodeId=" + nodeId + ']');
-
- return e.node().id().equals(nodeId);
- }
- };
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
index dfb4c68..b6fcebc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
@@ -75,12 +75,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
/** Near enabled flag. */
protected boolean nearEnabled;
- /** Evict backup sync. */
- protected boolean evictSync;
-
- /** Evict near sync. */
- protected boolean evictNearSync = true;
-
/** Policy max. */
protected int plcMax = 10;
@@ -111,7 +105,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
cc.setCacheMode(mode);
cc.setEvictionPolicy(createPolicy(plcMax));
cc.setOnheapCacheEnabled(true);
- cc.setEvictSynchronized(evictSync);
cc.setWriteSynchronizationMode(syncCommit ? FULL_SYNC : FULL_ASYNC);
cc.setStartSize(plcMax);
cc.setAtomicityMode(TRANSACTIONAL);
@@ -706,7 +699,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
nearEnabled = true;
nearMax = 3;
plcMax = 10;
- evictNearSync = true;
syncCommit = true;
gridCnt = 2;
@@ -719,19 +711,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
mode = PARTITIONED;
nearEnabled = false;
plcMax = 100;
- evictSync = false;
-
- gridCnt = 2;
-
- checkPartitionedMultiThreaded();
- }
-
- /** @throws Exception If failed. */
- public void testPartitionedNearDisabledBackupSyncMultiThreaded() throws Exception {
- mode = PARTITIONED;
- nearEnabled = false;
- plcMax = 100;
- evictSync = true;
gridCnt = 2;
@@ -743,19 +722,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
mode = PARTITIONED;
nearEnabled = true;
plcMax = 10;
- evictSync = false;
-
- gridCnt = 2;
-
- checkPartitionedMultiThreaded();
- }
-
- /** @throws Exception If failed. */
- public void testPartitionedNearEnabledBackupSyncMultiThreaded() throws Exception {
- mode = PARTITIONED;
- nearEnabled = true;
- plcMax = 10;
- evictSync = true;
gridCnt = 2;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index 04fdf77..c97f2ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -83,7 +83,6 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setEvictionPolicy(plc);
- cc.setEvictSynchronizedKeyBufferSize(1);
cc.setOnheapCacheEnabled(true);
if (testStore != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
index b583fb0..a3a61a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
@@ -81,7 +81,6 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest
ccfg.setEvictionPolicy(plc);
ccfg.setOnheapCacheEnabled(true);
- ccfg.setEvictSynchronized(false);
cfg.setPeerClassLoadingEnabled(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index 4a1a3da..1ad8d75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -59,7 +59,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setCacheMode(LOCAL);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setEvictSynchronized(false);
c.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 080902c..ec2aa61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -132,8 +132,6 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setEvictSynchronized(false);
-
if (store != null) {
cc.setCacheStoreFactory(new IgniteReflectionFactory<CacheStore>(TestStore.class));
cc.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 6dfa609..c5cea67 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -82,7 +82,6 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
cc.setOnheapCacheEnabled(true);
cc.setBackups(1);
cc.setAffinity(new RendezvousAffinityFunction(true));
- cc.setEvictSynchronized(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
index 6ffb135..4152abf 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -116,7 +116,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCach
import org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest;
import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedEvictionSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedJobExecutionTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicBasicStoreSelfTest;
import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGetAndTransformStoreSelfTest;
@@ -228,7 +227,6 @@ public class IgniteCacheTestSuite2 extends TestSuite {
suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
- suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
index 60fe5bf..f9e555e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
@@ -75,8 +75,6 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
- cacheCfg.setEvictSynchronized(true);
- cacheCfg.setEvictSynchronizedKeyBufferSize(1);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setEvictionPolicy(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac872077/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index ce77ffe..6d49a3b 100755
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -869,11 +869,6 @@ object VisorCacheCommand {
cacheT += ("Eviction Policy", safe(evictCfg.policy()))
cacheT += ("Eviction Policy Max Size", safe(evictCfg.policyMaxSize()))
cacheT += ("Eviction Filter", safe(evictCfg.filter()))
- cacheT += ("Eviction Key Buffer Size", evictCfg.synchronizedKeyBufferSize())
- cacheT += ("Eviction Synchronized", bool2Str(evictCfg.evictSynchronized()))
- cacheT += ("Eviction Overflow Ratio", evictCfg.maxOverflowRatio())
- cacheT += ("Synchronous Eviction Timeout", evictCfg.synchronizedTimeout())
- cacheT += ("Synchronous Eviction Concurrency Level", evictCfg.synchronizedConcurrencyLevel())
cacheT += ("Near Cache Enabled", bool2Str(nearCfg.nearEnabled()))
cacheT += ("Near Start Size", nearCfg.nearStartSize())