You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 14:56:37 UTC
[1/4] incubator-ignite git commit: IGNITE-383 Rename preload to
rebalance.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-383 [created] dc04e98c6
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
index 34ef4aa..121e0ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java
@@ -33,7 +33,7 @@ import javax.cache.configuration.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -84,7 +84,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes
ccfg.setCacheMode(PARTITIONED);
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setDistributionMode(NEAR_PARTITIONED);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setBackups(BACKUP_CNT);
ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 9cc7ed9..db135fb 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
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -64,7 +64,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(NONE);
+ cacheCfg.setRebalanceMode(NONE);
cacheCfg.setAffinity(aff);
cacheCfg.setSwapEnabled(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index e5a403b..5e13924 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -36,7 +36,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -66,7 +66,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setBackups(backups);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
index cdeaa54..75dad86 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Partitioned affinity test.
@@ -73,7 +73,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends
cc.setAffinity(aff);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 9cf7283..48f4948 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction.*;
import static org.apache.ignite.events.EventType.*;
@@ -68,7 +68,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(BACKUPS);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
index b86419b..9dd09dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java
@@ -37,7 +37,7 @@ public class GridCachePartitionedBasicOpSelfTest extends GridCacheBasicOpAbstrac
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setBackups(2);
- cc.setPreloadMode(CachePreloadMode.SYNC);
+ cc.setRebalanceMode(CacheRebalanceMode.SYNC);
cc.setAtomicityMode(TRANSACTIONAL);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
index 6232457..8df1064 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.distributed.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests events.
@@ -43,7 +43,7 @@ public class GridCachePartitionedEventSelfTest extends GridCacheEventAbstractTes
// Setting preload mode to SYNC is necessary due to race condition with test scenario in ASYNC mode.
// In ASYNC mode preloader can fetch value from previous test and update it before next test run.
// As a result test will see previous value while it expects null
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index 8950f45..af53f8d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -86,7 +86,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
cfg.setEvictionPolicy(null);
cfg.setBackups(1);
cfg.setDistributionMode(PARTITIONED_ONLY);
- cfg.setPreloadPartitionedDelay(-1);
+ cfg.setRebalancePartitionedDelay(-1);
cfg.setBackups(1);
cfg.setStatisticsEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
index 015b8a2..7f019cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -46,7 +46,7 @@ public class GridCachePartitionedMetricsSelfTest extends GridCacheTransactionalA
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(gridCount() - 1);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 23b6aa5..dde7688 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -42,7 +42,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -99,7 +99,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
// Default cache configuration.
CacheConfiguration cacheCfg = defaultCacheConfiguration();
- cacheCfg.setPreloadMode(NONE);
+ cacheCfg.setRebalanceMode(NONE);
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index c7903df..ba1d2cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CachePeekMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
@@ -48,7 +48,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cc = super.cacheConfiguration(gridName);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
return cc;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
index 30f4a28..5fac564 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java
@@ -43,8 +43,8 @@ public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRe
cc.setWriteSynchronizationMode(FULL_ASYNC);
cc.setDistributionMode(PARTITIONED_ONLY);
cc.setStartSize(20);
- cc.setPreloadMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceMode(preloadMode);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
index e2fd6a5..a6d7032 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java
@@ -42,8 +42,8 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_ASYNC);
cc.setStartSize(20);
- cc.setPreloadMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceMode(preloadMode);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
index 2c510c5..29f2890 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
@@ -33,7 +33,7 @@ import javax.cache.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -57,7 +57,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
cc1.setCacheMode(PARTITIONED);
cc1.setBackups(1);
cc1.setWriteSynchronizationMode(FULL_SYNC);
- cc1.setPreloadMode(preloadMode);
+ cc1.setRebalanceMode(preloadMode);
cc1.setEvictionPolicy(null);
cc1.setSwapEnabled(false);
cc1.setCacheStoreFactory(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
index afa1fc4..ccbd235 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
@@ -75,7 +75,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb
// Query should be executed without ongoing transactions.
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setBackups(0);
- cc.setPreloadMode(CachePreloadMode.SYNC);
+ cc.setRebalanceMode(CacheRebalanceMode.SYNC);
cc.setAtomicityMode(TRANSACTIONAL);
cc.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 685f9d2..9e80df6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -78,7 +78,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
cc.setCacheMode(CacheMode.PARTITIONED);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18));
cc.setBackups(1);
- cc.setPreloadMode(CachePreloadMode.SYNC);
+ cc.setRebalanceMode(CacheRebalanceMode.SYNC);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
index 289fa13..1806687 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.log4j.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests for partitioned cache transactions.
@@ -57,7 +57,7 @@ public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingle
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
TcpDiscoverySpi spi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
index 1c203ef..ee2eb56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.transactions.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -83,7 +83,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes
CacheConfiguration cc = defaultCacheConfiguration();
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
cc.setCacheMode(REPLICATED);
cc.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
index 97d8cce..9cc1517 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -42,9 +42,9 @@ public class GridCacheReplicatedNodeRestartSelfTest extends GridCacheAbstractNod
cc.setStartSize(20);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
- cc.setPreloadBatchSize(20);
+ cc.setRebalanceBatchSize(20);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
index d5b2efd..ece9179 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -70,9 +70,9 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
// This property is essential for this test.
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
- cacheCfg.setPreloadBatchSize(10000);
+ cacheCfg.setRebalanceBatchSize(10000);
cfg.setCacheConfiguration(cacheCfg);
cfg.setDeploymentMode(CONTINUOUS);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 6c417d3..faf6fdc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -32,7 +32,7 @@ import javax.cache.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -60,7 +60,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
cc1.setName("one");
cc1.setCacheMode(REPLICATED);
cc1.setWriteSynchronizationMode(FULL_SYNC);
- cc1.setPreloadMode(preloadMode);
+ cc1.setRebalanceMode(preloadMode);
cc1.setEvictionPolicy(null);
cc1.setSwapEnabled(false);
cc1.setCacheStoreFactory(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 969692e..e356c87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -38,7 +38,7 @@ import java.io.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
import static org.apache.ignite.events.EventType.*;
@@ -48,7 +48,7 @@ import static org.apache.ignite.events.EventType.*;
*/
public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
/** */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int batchSize = 4096;
@@ -104,9 +104,9 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(REPLICATED);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
- cacheCfg.setPreloadBatchSize(batchSize);
- cacheCfg.setPreloadThreadPoolSize(poolSize);
+ cacheCfg.setRebalanceMode(preloadMode);
+ cacheCfg.setRebalanceBatchSize(batchSize);
+ cacheCfg.setRebalanceThreadPoolSize(poolSize);
return cacheCfg;
}
@@ -170,7 +170,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < 3; i++) {
evts = g2.events().localQuery(F.<Event>alwaysTrue(),
- EVT_CACHE_PRELOAD_STARTED, EVT_CACHE_PRELOAD_STOPPED);
+ EVT_CACHE_REBALANCE_STARTED, EVT_CACHE_REBALANCE_STOPPED);
if (evts.size() != 2) {
info("Wrong events collection size (will retry in 1000 ms): " + evts.size());
@@ -185,8 +185,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
Iterator<Event> iter = evts.iterator();
- assertEquals(EVT_CACHE_PRELOAD_STARTED, iter.next().type());
- assertEquals(EVT_CACHE_PRELOAD_STOPPED, iter.next().type());
+ assertEquals(EVT_CACHE_REBALANCE_STARTED, iter.next().type());
+ assertEquals(EVT_CACHE_REBALANCE_STOPPED, iter.next().type());
GridCacheAdapter<Integer, String> cache2 = ((IgniteKernal)g2).internalCache(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
index e1040c0..f0292a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java
@@ -71,16 +71,16 @@ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommo
ignite.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event e) {
- if (e.type() == EVT_CACHE_PRELOAD_STARTED)
+ if (e.type() == EVT_CACHE_REBALANCE_STARTED)
preloadStartCnt.incrementAndGet();
- else if (e.type() == EVT_CACHE_PRELOAD_STOPPED)
+ else if (e.type() == EVT_CACHE_REBALANCE_STOPPED)
preloadStopCnt.incrementAndGet();
else
fail("Unexpected event type: " + e.type());
return true;
}
- }, EVT_CACHE_PRELOAD_STARTED, EVT_CACHE_PRELOAD_STOPPED);
+ }, EVT_CACHE_REBALANCE_STARTED, EVT_CACHE_REBALANCE_STOPPED);
startGrid(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index 1f560f7..1b238a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Base class for eviction tests.
@@ -75,7 +75,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
cc.setSwapEnabled(false);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cc.setEvictionFilter(filter);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setAtomicityMode(TRANSACTIONAL);
if (mode == PARTITIONED)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
index ea8f060..7b4309d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java
@@ -31,7 +31,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -60,7 +60,7 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(PRIMARY_SYNC);
cc.setDistributionMode(NEAR_PARTITIONED);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
cc.setStartSize(100);
cc.setQueryIndexEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
index a381082..f7527c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -71,7 +71,7 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb
cc.setCacheMode(cacheMode);
cc.setWriteSynchronizationMode(PRIMARY_SYNC);
cc.setDistributionMode(cnt == 0 ? NEAR_ONLY : PARTITIONED_ONLY);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setNearEvictionPolicy(new CacheLruEvictionPolicy(EVICTION_MAX_SIZE));
cc.setStartSize(100);
cc.setQueryIndexEnabled(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index bee5b95..4fd519f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -52,7 +52,7 @@ import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.*;
@@ -79,7 +79,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
cacheCfg.setCacheMode(cacheMode());
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setDistributionMode(distributionMode());
- cacheCfg.setPreloadMode(ASYNC);
+ cacheCfg.setRebalanceMode(ASYNC);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore()));
cacheCfg.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index 0c48643..73d0d64 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -40,7 +40,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -87,7 +87,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
cache.setAtomicityMode(atomicityMode());
cache.setDistributionMode(distributionMode());
cache.setWriteSynchronizationMode(FULL_SYNC);
- cache.setPreloadMode(SYNC);
+ cache.setRebalanceMode(SYNC);
if (cacheMode() == PARTITIONED)
cache.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index b212f02..2c36e86 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
@@ -133,7 +133,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
}
dataCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- dataCfg.setPreloadMode(SYNC);
+ dataCfg.setRebalanceMode(SYNC);
dataCfg.setAffinityMapper(new IgfsGroupDataBlocksKeyMapper(128));
dataCfg.setQueryIndexEnabled(false);
dataCfg.setAtomicityMode(TRANSACTIONAL);
@@ -144,7 +144,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
metaCfg.setCacheMode(REPLICATED);
metaCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- metaCfg.setPreloadMode(SYNC);
+ metaCfg.setRebalanceMode(SYNC);
metaCfg.setQueryIndexEnabled(false);
metaCfg.setAtomicityMode(TRANSACTIONAL);
@@ -610,7 +610,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
return true;
}
- }, EVT_CACHE_PRELOAD_STOPPED);
+ }, EVT_CACHE_REBALANCE_STOPPED);
}
Ignite g = startGrid(GRID_CNT);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
index ccc139e..10134b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
@@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -69,7 +69,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
cacheCfg.setEvictionPolicy(new CacheLruEvictionPolicy(100000));
cacheCfg.setBackups(1);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
index 00f4361..4a9d602 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
@@ -82,8 +82,8 @@
</bean>
</property>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
index 01bd44f..6704e85 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
@@ -110,8 +110,8 @@
</bean>
</property>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
<property name="distributionMode" value="PARTITIONED_ONLY"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 1055102..bc5d4eb 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
@@ -68,7 +68,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
cc.setCacheMode(CacheMode.PARTITIONED);
cc.setStartSize(200);
- cc.setPreloadMode(CachePreloadMode.SYNC);
+ cc.setRebalanceMode(CacheRebalanceMode.SYNC);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setEvictionPolicy(new CacheLruEvictionPolicy<>(1000));
cc.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
index 4a5cea8..c71ccbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -78,7 +78,7 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(1);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index 71bd8a5..6150cb0 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -39,7 +39,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.locks.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -91,7 +91,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(CacheMode.PARTITIONED);
cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
return cacheCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index f1e813f..632d918 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -44,7 +44,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
/**
@@ -365,7 +365,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
for (GridCache<?, ?> c : ((IgniteEx)g).cachesx()) {
CacheConfiguration cfg = c.configuration();
- if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) {
+ if (cfg.getCacheMode() == PARTITIONED && cfg.getRebalanceMode() != NONE && g.cluster().nodes().size() > 1) {
CacheAffinityFunction aff = cfg.getAffinity();
GridDhtCacheAdapter<?, ?> dht = dht(c);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
index 95ed478..d47d2a7 100644
--- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
+++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
@@ -130,8 +130,8 @@
-->
<property name="backups" value="1"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<!--
@@ -179,8 +179,8 @@
-->
<property name="backups" value="1"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<!--
@@ -199,8 +199,8 @@
<!-- REPLICATED cache mode. -->
<property name="cacheMode" value="REPLICATED"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
<!-- Initial cache size. -->
<property name="startSize" value="150000"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 37b5c08..f8eada9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -41,7 +41,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests for fields queries.
@@ -93,7 +93,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
cache.setCacheMode(cacheMode());
cache.setAtomicityMode(atomicityMode());
cache.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cache.setPreloadMode(SYNC);
+ cache.setRebalanceMode(SYNC);
CacheQueryConfiguration qcfg = new CacheQueryConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index a3173bf..9cd867a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -49,7 +49,7 @@ import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.*;
import static org.apache.ignite.events.EventType.*;
@@ -133,7 +133,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
cc.setReadThrough(true);
cc.setWriteThrough(true);
cc.setLoadPreviousValue(true);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setSwapEnabled(true);
cc.setEvictNearSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index aa408f4..47188aa 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -36,7 +36,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests cross cache queries.
@@ -91,7 +91,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
cc.setName(name);
cc.setCacheMode(mode);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setSwapEnabled(true);
cc.setEvictNearSynchronized(false);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
index 6de54ec..6378a9b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java
@@ -37,7 +37,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.query.Query.*;
/**
@@ -93,7 +93,7 @@ public class GridCacheCrossCacheQuerySelfTestNewApi extends GridCommonAbstractTe
cc.setName(name);
cc.setCacheMode(mode);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setSwapEnabled(true);
cc.setEvictNearSynchronized(false);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 0b775e9..e1e9157 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -34,7 +34,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* GG-4368
@@ -62,7 +62,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setSwapEnabled(true);
cc.setDistributionMode(CacheDistributionMode.NEAR_PARTITIONED);
cc.setEvictNearSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
index 5462836..2558ac7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
@@ -140,7 +140,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
CollectingEventListener lsnr = new CollectingEventListener();
for (int i = 0; i < GRID_CNT; i++)
- grid(i).events().localListen(lsnr, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ grid(i).events().localListen(lsnr, EventType.EVT_CACHE_REBALANCE_STOPPED);
IgniteInternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() {
@SuppressWarnings({"BusyWait"})
@@ -171,12 +171,12 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
fut1.get();
fut2.get();
- info("Awaiting preload events [restartCnt=" + restartCnt.get() + ']');
+ info("Awaiting rebalance events [restartCnt=" + restartCnt.get() + ']');
boolean success = lsnr.awaitEvents(GRID_CNT * 2 * restartCnt.get(), 15000);
for (int i = 0; i < GRID_CNT; i++)
- grid(i).events().stopLocalListen(lsnr, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ grid(i).events().stopLocalListen(lsnr, EventType.EVT_CACHE_REBALANCE_STOPPED);
assert success;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 12e5bf8..4c65d42 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.query.h2.sql;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
@@ -40,7 +39,7 @@ import java.io.*;
import java.util.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -77,7 +76,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
cc.setAtomicityMode(CacheAtomicityMode.ATOMIC);
cc.setDistributionMode(PARTITIONED_ONLY);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setSwapEnabled(false);
CacheQueryConfiguration qcfg = new CacheQueryConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 7653573..da4577e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
*
@@ -62,7 +62,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
CacheConfiguration cache = defaultCacheConfiguration();
cache.setCacheMode(PARTITIONED);
- cache.setPreloadMode(NONE);
+ cache.setRebalanceMode(NONE);
cfg.setCacheConfiguration(cache);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index 7ac98ec..3316579 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -159,7 +159,7 @@ class VisorEventsCommand {
case "jo" => arr ++= EVTS_JOB_EXECUTION.toList
case "ta" => arr ++= EVTS_TASK_EXECUTION.toList
case "ca" => arr ++= EVTS_CACHE.toList
- case "cp" => arr ++= EVTS_CACHE_PRELOAD.toList
+ case "cp" => arr ++= EVTS_CACHE_REBALANCE.toList
case "sw" => arr ++= EVTS_SWAPSPACE.toList
case "di" => arr ++= EVTS_DISCOVERY.toList
case t => throw new IllegalArgumentException("Unknown event type: " + t)
@@ -185,7 +185,7 @@ class VisorEventsCommand {
case t if EVTS_TASK_EXECUTION.contains(t) => "ta"
case t if EVTS_CACHE.contains(t) => "ca"
case t if EVTS_SWAPSPACE.contains(t) => "sw"
- case t if EVTS_CACHE_PRELOAD.contains(t) => "cp"
+ case t if EVTS_CACHE_REBALANCE.contains(t) => "cp"
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index b9b5dbc..92a4f91 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -2424,8 +2424,8 @@ object visor extends VisorTag {
EVT_TASK_DEPLOYED,
EVT_TASK_UNDEPLOYED,
- EVT_CACHE_PRELOAD_STARTED,
- EVT_CACHE_PRELOAD_STOPPED,
+ EVT_CACHE_REBALANCE_STARTED,
+ EVT_CACHE_REBALANCE_STOPPED,
EVT_CLASS_DEPLOY_FAILED
)
[2/4] incubator-ignite git commit: IGNITE-383 Rename preload to
rebalance.
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 51cea4d..0e8a422 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -62,7 +62,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
cCfg.setAtomicityMode(atomicityMode());
cCfg.setAtomicWriteOrderMode(writeOrderMode());
cCfg.setDistributionMode(distributionMode());
- cCfg.setPreloadMode(SYNC);
+ cCfg.setRebalanceMode(SYNC);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
cCfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
index 0fcae87..361dc51 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java
@@ -100,7 +100,7 @@ public abstract class IgniteCacheAbstractStopBusySelfTest extends GridCommonAbst
if (gridName.endsWith(String.valueOf(CLN_GRD)))
cacheCfg.setDistributionMode(CacheDistributionMode.CLIENT_ONLY);
- cacheCfg.setPreloadMode(CachePreloadMode.SYNC);
+ cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
index 557390f..bd09833 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
@@ -59,7 +59,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA
ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY);
ccfg.setCacheMode(CacheMode.PARTITIONED);
- ccfg.setPreloadPartitionedDelay(-1);
+ ccfg.setRebalancePartitionedDelay(-1);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
index da3ac7b..6effba3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
@@ -29,7 +29,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -67,7 +67,7 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes
ccfg.setMemoryMode(colCfg.getMemoryMode());
ccfg.setDistributionMode(colCfg.getDistributionMode());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
index 602a321..44f2853 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -57,7 +57,7 @@ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractT
cc.setCacheMode(PARTITIONED);
cc.setBackups(1);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setEvictionPolicy(new CacheFifoEvictionPolicy(100));
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
index e0953d2..d56d5b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java
@@ -31,7 +31,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -72,7 +72,7 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setBackups(1);
cfg.setCacheConfiguration(cacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index c0f4200..8a49b46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*;
import static java.util.concurrent.TimeUnit.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -86,7 +86,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setBackups(0);
return cc;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 61d7f0d..923fd72 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -33,7 +33,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -55,7 +55,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
protected int backups = DFLT_BACKUPS;
@@ -76,7 +76,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
private static volatile int idx = -1;
/** Preload mode. */
- protected CachePreloadMode preloadMode = ASYNC;
+ protected CacheRebalanceMode preloadMode = ASYNC;
/** */
protected int preloadBatchSize = DFLT_BATCH_SIZE;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
index 334147b..23d58b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.transactions.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -53,7 +53,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setWriteSynchronizationMode(PRIMARY_SYNC);
ccfg.setBackups(1);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
ccfg.setDistributionMode(distributionMode());
cfg.setCacheConfiguration(ccfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
index 2b8957b..908f7f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
@@ -52,7 +52,7 @@ public class GridCacheEntrySetIterationPreloadingSelfTest extends GridCacheAbstr
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration ccfg = super.cacheConfiguration(gridName);
- ccfg.setPreloadMode(CachePreloadMode.SYNC);
+ ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
index 073381c..4bb6605 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java
@@ -30,7 +30,7 @@ import javax.cache.expiry.*;
import java.util.*;
import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -63,7 +63,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(gridName);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setCacheStoreFactory(null);
cfg.setWriteThrough(false);
cfg.setReadThrough(false);
@@ -103,7 +103,7 @@ public abstract class GridCacheExpiredEntriesPreloadAbstractSelfTest extends Gri
cache1.preloader().syncFuture().get();
- Collection<Event> evts = g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ Collection<Event> evts = g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED);
assertEquals("Expected all entries are preloaded.", KEYS_NUM, evts.size());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index e4d4e5c..4f9908a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -35,7 +35,7 @@ import java.util.concurrent.locks.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -88,7 +88,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(cacheMode());
cacheCfg.setWriteSynchronizationMode(FULL_ASYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index 1784c1c..3b16ff8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@ -42,7 +42,7 @@ import java.util.concurrent.locks.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -201,7 +201,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
ccfg.setName(CACHE_NAME);
ccfg.setCacheMode(cacheMode());
ccfg.setAtomicityMode(atomicityMode());
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
ccfg.setSwapEnabled(false);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setEvictionPolicy(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
index b78857d..6298992 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java
@@ -35,7 +35,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Partitioned affinity test.
@@ -77,7 +77,7 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra
cacheCfg.setBackups(BACKUPS);
cacheCfg.setAffinity(aff);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
index cc0d899..1c0a7b2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java
@@ -34,7 +34,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -75,7 +75,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(getCacheMode());
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
@@ -104,7 +104,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA
Ignite g2 = startGrid("g2");
- Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED);
checkPreloadEvents(evts, g2, U.toIntList(new int[]{1, 2, 3}));
}
@@ -119,7 +119,7 @@ public abstract class GridCachePreloadEventsAbstractSelfTest extends GridCommonA
for (Event evt : evts) {
CacheEvent cacheEvt = (CacheEvent)evt;
- assertEquals(EVT_CACHE_PRELOAD_OBJECT_LOADED, cacheEvt.type());
+ assertEquals(EVT_CACHE_REBALANCE_OBJECT_LOADED, cacheEvt.type());
assertEquals(g.jcache(null).getName(), cacheEvt.cacheName());
assertEquals(g.cluster().localNode().id(), cacheEvt.node().id());
assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index 802ac4a..9818176 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.io.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -41,10 +41,10 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb
protected static final String TEST_STRING = "ABC";
/** */
- protected static final CachePreloadMode DFLT_PRELOAD_MODE = SYNC;
+ protected static final CacheRebalanceMode DFLT_PRELOAD_MODE = SYNC;
/** */
- protected CachePreloadMode preloadMode = DFLT_PRELOAD_MODE;
+ protected CacheRebalanceMode preloadMode = DFLT_PRELOAD_MODE;
/** */
protected LifecycleBean lifecycleBean;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
index da111a6..c5acd6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -56,7 +56,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
@@ -74,7 +74,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
private static volatile int idx = -1;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -112,8 +112,8 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setStartSize(20);
- cc.setPreloadMode(preloadMode);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceMode(preloadMode);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
index 4f5da0b..50be8d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
@@ -31,7 +31,7 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -75,7 +75,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
ccfg.setCacheMode(cacheMode());
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setDistributionMode(partitionDistributionMode());
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
if (cacheMode() == CacheMode.PARTITIONED)
ccfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
index 370e118..8436ad4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
@@ -30,7 +30,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
@@ -209,7 +209,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(gridName);
- cfg.setPreloadMode(ASYNC);
+ cfg.setRebalanceMode(ASYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index 1627a21..41f58dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -37,7 +37,7 @@ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
@@ -76,7 +76,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
ccfg.setAtomicityMode(ATOMIC);
ccfg.setDistributionMode(NEAR_PARTITIONED);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
assert writeOrderMode != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
index 8b30392..8441b28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.log4j.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Test txs in single-threaded mode for colocated cache.
@@ -57,7 +57,7 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
TcpDiscoverySpi spi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 5a6cd22..fd5e5cc 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
@@ -38,7 +38,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -73,7 +73,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
cacheCfg.setSwapEnabled(false);
cacheCfg.setEvictSynchronized(true);
cacheCfg.setEvictNearSynchronized(true);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(atomicityMode());
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
cacheCfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 f8f8ff1..10ccaeb 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
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -70,7 +70,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadMode(NONE);
+ cacheCfg.setRebalanceMode(NONE);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setSwapEnabled(false);
cacheCfg.setEvictSynchronized(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
index cc274ce..7512f71 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
@@ -36,7 +36,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests for internal DHT entry.
@@ -64,7 +64,7 @@ public class GridCacheDhtInternalEntrySelfTest extends GridCommonAbstractTest {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 2));
cacheCfg.setBackups(0);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
index 49ae9db..2071bfa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Tests dht mapping.
@@ -50,7 +50,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setBackups(BACKUPS);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index 36df6bf..277d0da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -48,13 +48,13 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -82,9 +82,9 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(preloadMode);
+ cc.setRebalanceMode(preloadMode);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index fe88081..c9dd9ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -42,7 +42,7 @@ import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Test cases for partitioned cache {@link GridDhtPreloader preloader}.
@@ -55,7 +55,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
private static final int PRELOAD_DELAY = 5000;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** Preload delay. */
private long delay = -1;
@@ -73,8 +73,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(preloadMode);
- cc.setPreloadPartitionedDelay(delay);
+ cc.setRebalanceMode(preloadMode);
+ cc.setRebalancePartitionedDelay(delay);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 128));
cc.setBackups(1);
cc.setAtomicityMode(TRANSACTIONAL);
@@ -130,7 +130,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
g2.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
@@ -138,7 +138,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
info("Beginning to wait for cache1 repartition.");
@@ -207,7 +207,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
g2.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
@@ -215,7 +215,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EventType.EVT_CACHE_PRELOAD_STOPPED);
+ }, EventType.EVT_CACHE_REBALANCE_STOPPED);
U.sleep(1000);
@@ -245,7 +245,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
/** @throws Exception If failed. */
public void testAutomaticPreload() throws Exception {
delay = 0;
- preloadMode = CachePreloadMode.SYNC;
+ preloadMode = CacheRebalanceMode.SYNC;
Ignite g0 = startGrid(0);
@@ -322,7 +322,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
/** @throws Exception If failed. */
public void testManualPreloadSyncMode() throws Exception {
- preloadMode = CachePreloadMode.SYNC;
+ preloadMode = CacheRebalanceMode.SYNC;
delay = -1;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index 1248770..4d09a78 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@ -38,7 +38,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
import static org.apache.ignite.events.EventType.*;
@@ -82,12 +82,12 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC);
- cacheCfg.setPreloadMode(NONE);
+ cacheCfg.setRebalanceMode(NONE);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
- //cacheCfg.setPreloadThreadPoolSize(1);
+ //cacheCfg.setRebalanceThreadPoolSize(1);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
@@ -255,7 +255,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
return true;
}
- }, EVTS_CACHE_PRELOAD);
+ }, EVTS_CACHE_REBALANCE);
list.add(g);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index e58c16e..f4a1058 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -47,7 +47,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
private static final int KEY_CNT = 1000;
/** Preload mode. */
- private CachePreloadMode preloadMode = CachePreloadMode.SYNC;
+ private CacheRebalanceMode preloadMode = CacheRebalanceMode.SYNC;
/** IP finder. */
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -62,7 +62,7 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
cc.setCacheMode(PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(preloadMode);
+ cc.setRebalanceMode(preloadMode);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 521));
cc.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
index 6ac5f7d..287245d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -54,7 +54,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
private int backups;
/** Preload mode. */
- private CachePreloadMode preloadMode;
+ private CacheRebalanceMode preloadMode;
/** IP finder. */
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -69,7 +69,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setBackups(backups);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index ae94b12..c03ac23 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -60,13 +60,13 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -109,9 +109,9 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadBatchSize(preloadBatchSize);
+ cacheCfg.setRebalanceBatchSize(preloadBatchSize);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
@@ -145,7 +145,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
* @return {@code True} if synchronous preloading.
*/
private boolean isSync(GridCache<?, ?> c) {
- return c.configuration().getPreloadMode() == SYNC;
+ return c.configuration().getRebalanceMode() == SYNC;
}
/**
@@ -269,14 +269,14 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
futs.add(waitForLocalEvent(last.events(), new P1<Event>() {
@Override public boolean apply(Event e) {
- CachePreloadingEvent evt = (CachePreloadingEvent)e;
+ CacheRebalancingEvent evt = (CacheRebalancingEvent)e;
ClusterNode node = evt.discoveryNode();
- return evt.type() == EVT_CACHE_PRELOAD_STOPPED && node.id().equals(nodeId) &&
+ return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
evt.discoveryEventType() == EVT_NODE_LEFT;
}
- }, EVT_CACHE_PRELOAD_STOPPED));
+ }, EVT_CACHE_REBALANCE_STOPPED));
info("Before grid stop [name=" + g.name() + ", fullTop=" + top2string(ignites));
@@ -452,7 +452,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
return true;
}
- }, EVTS_CACHE_PRELOAD);
+ }, EVTS_CACHE_REBALANCE);
list.add(g);
}
@@ -536,14 +536,14 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
for (Ignite gg : ignites)
futs.add(waitForLocalEvent(gg.events(), new P1<Event>() {
@Override public boolean apply(Event e) {
- CachePreloadingEvent evt = (CachePreloadingEvent)e;
+ CacheRebalancingEvent evt = (CacheRebalancingEvent)e;
ClusterNode node = evt.discoveryNode();
- return evt.type() == EVT_CACHE_PRELOAD_STOPPED && node.id().equals(nodeId) &&
+ return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
evt.discoveryEventType() == EVT_NODE_LEFT;
}
- }, EVT_CACHE_PRELOAD_STOPPED));
+ }, EVT_CACHE_REBALANCE_STOPPED));
info("Before grid stop [name=" + g.name() + ", fullTop=" + top2string(ignites));
@@ -618,7 +618,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
ClusterNode loc = ignite.cluster().localNode();
- boolean sync = cache.getConfiguration(CacheConfiguration.class).getPreloadMode() == SYNC;
+ boolean sync = cache.getConfiguration(CacheConfiguration.class).getRebalanceMode() == SYNC;
for (int i = 0; i < cnt; i++) {
Collection<ClusterNode> nodes = ignite.cluster().nodes();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
index 9ff1bf2..fa04778 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -34,7 +34,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
@@ -53,7 +53,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Default cache count. */
private static final int DFLT_CACHE_CNT = 10;
@@ -62,7 +62,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -95,9 +95,9 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
cacheCfg.setName("partitioned-" + i);
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadBatchSize(preloadBatchSize);
+ cacheCfg.setRebalanceBatchSize(preloadBatchSize);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cacheCfg.setBackups(backups);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -135,7 +135,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest
* @return {@code True} if synchronoous preloading.
*/
private boolean isSync(IgniteCache<?, ?> c) {
- return c.getConfiguration(CacheConfiguration.class).getPreloadMode() == SYNC;
+ return c.getConfiguration(CacheConfiguration.class).getRebalanceMode() == SYNC;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index 480d01c..38a87d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
/**
@@ -46,13 +46,13 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
private static final int DFLT_PARTITIONS = 521;
/** Preload batch size. */
- private static final int DFLT_BATCH_SIZE = DFLT_PRELOAD_BATCH_SIZE;
+ private static final int DFLT_BATCH_SIZE = DFLT_REBALANCE_BATCH_SIZE;
/** Number of key backups. Each test method can set this value as required. */
private int backups = DFLT_BACKUPS;
/** Preload mode. */
- private CachePreloadMode preloadMode = ASYNC;
+ private CacheRebalanceMode preloadMode = ASYNC;
/** */
private int preloadBatchSize = DFLT_BATCH_SIZE;
@@ -83,9 +83,9 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
CacheConfiguration cc = defaultCacheConfiguration();
cc.setCacheMode(PARTITIONED);
- cc.setPreloadBatchSize(preloadBatchSize);
+ cc.setRebalanceBatchSize(preloadBatchSize);
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(preloadMode);
+ cc.setRebalanceMode(preloadMode);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions));
cc.setBackups(backups);
cc.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
index f0a7be7..b64d59a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -49,7 +49,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(gridCount() - 1);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setDistributionMode(PARTITIONED_ONLY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
index 0408ca3..212bd35 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.typedef.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -41,7 +41,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
private boolean replicatedAffinity = true;
/** */
- private CachePreloadMode preloadMode = SYNC;
+ private CacheRebalanceMode preloadMode = SYNC;
/** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration() {
@@ -76,7 +76,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
}
});
- cacheCfg.setPreloadMode(preloadMode);
+ cacheCfg.setRebalanceMode(preloadMode);
return cacheCfg;
}
@@ -118,7 +118,7 @@ public class GridCachePartitionedPreloadEventsSelfTest extends GridCachePreloadE
for (Object key : g2Keys)
g2.jcache(null).put(key, "changed val");
- Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ Collection<Event> evts = g2.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED);
checkPreloadEvents(evts, g2, g2Keys);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
index c64f9a5..00bee77 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -40,7 +40,7 @@ import java.util.concurrent.locks.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -77,7 +77,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra
cc.setCacheMode(PARTITIONED);
cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18));
cc.setBackups(1);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setDistributionMode(PARTITIONED_ONLY);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
index f8c41f0..f983248 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.consistenthash.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
@@ -33,7 +32,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.events.EventType.*;
/**
@@ -61,7 +60,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
protected CacheConfiguration cacheConfiguration() {
CacheConfiguration cacheCfg = defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10));
cacheCfg.setBackups(0);
return cacheCfg;
@@ -93,12 +92,12 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
Thread.sleep(5000);
Collection<Event> objEvts =
- g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_UNLOADED);
+ g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
checkObjectUnloadEvents(objEvts, g1, g2Keys);
Collection <Event> partEvts =
- g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_PRELOAD_PART_UNLOADED);
+ g1.events().localQuery(F.<Event>alwaysTrue(), EVT_CACHE_REBALANCE_PART_UNLOADED);
checkPartitionUnloadEvents(partEvts, g1, dht(g2.jcache(null)).topology().localPartitions());
}
@@ -114,7 +113,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
for (Event evt : evts) {
CacheEvent cacheEvt = ((CacheEvent)evt);
- assertEquals(EVT_CACHE_PRELOAD_OBJECT_UNLOADED, cacheEvt.type());
+ assertEquals(EVT_CACHE_REBALANCE_OBJECT_UNLOADED, cacheEvt.type());
assertEquals(g.jcache(null).getName(), cacheEvt.cacheName());
assertEquals(g.cluster().localNode().id(), cacheEvt.node().id());
assertEquals(g.cluster().localNode().id(), cacheEvt.eventNode().id());
@@ -132,7 +131,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract
assertEquals(parts.size(), evts.size());
for (Event evt : evts) {
- CachePreloadingEvent unloadEvt = (CachePreloadingEvent)evt;
+ CacheRebalancingEvent unloadEvt = (CacheRebalancingEvent)evt;
final int part = unloadEvt.partition();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 173940d..c6214e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -89,7 +89,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
ccfg.setAtomicWriteOrderMode(writeOrder);
ccfg.setWriteSynchronizationMode(writeSync);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
return ccfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index 7470174..df2bd9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -33,7 +33,7 @@ import org.apache.ignite.testframework.junits.common.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Partitioned affinity test.
@@ -78,7 +78,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
cc.setAffinity(affinityFunction());
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
index 96e3afa..03ac4aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.configuration.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Multi-node tests for partitioned cache.
@@ -50,7 +50,7 @@ public class GridCacheAtomicMultiNodeFullApiSelfTest extends GridCachePartitione
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cc = super.cacheConfiguration(gridName);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setBackups(1);
cc.setAtomicWriteOrderMode(atomicWriteOrderMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
index b61ff36..7ecc3cd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.cache.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -39,7 +39,7 @@ public class GridCacheAtomicPartitionedMetricsSelfTest extends GridCacheAbstract
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(gridCount() - 1);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setWriteSynchronizationMode(FULL_SYNC);
cfg.setAtomicityMode(ATOMIC);
cfg.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index eca69b7..a7d560b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
@@ -31,13 +30,11 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.junits.common.*;
-import java.util.concurrent.*;
-
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -60,7 +57,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
cc.setDistributionMode(NEAR_PARTITIONED);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setBackups(1);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setNearEvictionPolicy(null);
cc.setAtomicityMode(atomicityMode());
cc.setAtomicWriteOrderMode(PRIMARY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 1a6a4ff..5baf882 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -34,7 +34,7 @@ import org.apache.log4j.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -70,7 +70,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
TcpDiscoverySpi spi = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index ded7c89..b3d153b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -61,7 +61,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(1);
cacheCfg.setDistributionMode(nearOnly ? NEAR_ONLY : NEAR_PARTITIONED);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cfg.setCacheConfiguration(cacheCfg);
[3/4] incubator-ignite git commit: IGNITE-383 Rename preload to
rebalance.
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index af63307..0200536 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -529,7 +529,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
boolean swap = cctx.isSwapOrOffheapEnabled();
- boolean rec = cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_UNLOADED);
+ boolean rec = cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
for (Iterator<GridDhtCacheEntry<K, V>> it = map.values().iterator(); it.hasNext();) {
GridDhtCacheEntry<K, V> cached = it.next();
@@ -543,7 +543,7 @@ public class GridDhtLocalPartition<K, V> implements Comparable<GridDhtLocalParti
if (rec)
cctx.events().addEvent(cached.partition(), cached.key(), cctx.localNodeId(), (IgniteUuid)null,
- null, EVT_CACHE_PRELOAD_OBJECT_UNLOADED, null, false, cached.rawGet(),
+ null, EVT_CACHE_REBALANCE_OBJECT_UNLOADED, null, false, cached.rawGet(),
cached.hasValue(), null, null, null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index dba5ed2..acf33e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -1070,7 +1070,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
boolean replicate = cctx.isDrEnabled();
- boolean rec = cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ boolean rec = cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED);
for (GridCacheEntryInfo<K, V> info : res.preloadEntries()) {
try {
@@ -1080,7 +1080,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
info.expireTime(), true, topVer, replicate ? DR_PRELOAD : DR_NONE)) {
if (rec && !entry.isInternal())
cctx.events().addEvent(entry.partition(), entry.key(), cctx.localNodeId(),
- (IgniteUuid)null, null, EVT_CACHE_PRELOAD_OBJECT_LOADED, info.value(), true, null,
+ (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, info.value(), true, null,
false, null, null, null);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index acf00eb..6978678 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -244,7 +244,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
}
}
- if (cctx.preloadEnabled()) {
+ if (cctx.rebalanceEnabled()) {
for (int p = 0; p < num; p++) {
// If this is the first node in grid.
if (oldest.id().equals(loc.id()) && oldest.id().equals(exchId.nodeId())) {
@@ -322,7 +322,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
updateLocal(p, loc.id(), locPart.state(), updateSeq);
if (log.isDebugEnabled())
- log.debug("Evicting partition with preloading disabled " +
+ log.debug("Evicting partition with rebalancing disabled " +
"(it does not belong to affinity): " + locPart);
}
}
@@ -334,7 +334,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
}
catch (GridDhtInvalidPartitionException e) {
if (log.isDebugEnabled())
- log.debug("Ignoring invalid partition with disabled preloader (no need to " +
+ log.debug("Ignoring invalid partition with disabled rebalancer (no need to " +
"pre-create a partition if it no longer belongs to local node: " + e.partition());
}
}
@@ -396,7 +396,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
GridDhtPartitionState state = locPart.state();
if (state == MOVING) {
- if (cctx.preloadEnabled()) {
+ if (cctx.rebalanceEnabled()) {
Collection<ClusterNode> owners = owners(p);
// If there are no other owners, then become an owner.
@@ -414,7 +414,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
log.debug("Owned partition: " + locPart);
}
else if (log.isDebugEnabled())
- log.debug("Will not own partition (there are owners to preload from) [locPart=" +
+ log.debug("Will not own partition (there are owners to rebalance from) [locPart=" +
locPart + ", owners = " + owners + ']');
}
else
@@ -659,7 +659,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
/** {@inheritDoc} */
@Override public List<ClusterNode> owners(int p, long topVer) {
- if (!cctx.preloadEnabled())
+ if (!cctx.rebalanceEnabled())
return ownersAndMoving(p, topVer);
return nodes(p, topVer, OWNING);
@@ -672,7 +672,7 @@ class GridDhtPartitionTopologyImpl<K, V> implements GridDhtPartitionTopology<K,
/** {@inheritDoc} */
@Override public List<ClusterNode> moving(int p) {
- if (!cctx.preloadEnabled())
+ if (!cctx.rebalanceEnabled())
return ownersAndMoving(p, -1);
return nodes(p, -1, MOVING);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index e3cdc6e..918cf4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -1249,7 +1249,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
long topVer = tx.topologyVersion();
- boolean rec = cctx.gridEvents().isRecordable(EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ boolean rec = cctx.gridEvents().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED);
for (GridCacheEntryInfo<K, V> info : res.preloadEntries()) {
GridCacheContext<K, V> cacheCtx = cctx.cacheContext(info.cacheId());
@@ -1264,7 +1264,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
info.ttl(), info.expireTime(), true, topVer, drType)) {
if (rec && !entry.isInternal())
cacheCtx.events().addEvent(entry.partition(), entry.key(), cctx.localNodeId(),
- (IgniteUuid)null, null, EVT_CACHE_PRELOAD_OBJECT_LOADED, info.value(), true, null,
+ (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, info.value(), true, null,
false, null, null, null);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 170a0c0..9f627f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -292,10 +292,10 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
try {
if (e != null && !e.isNewLocked()) {
if (log.isDebugEnabled())
- log.debug("Will not preload key (entry is not new) [cacheName=" + cctx.name() +
+ log.debug("Will not rebalance key (entry is not new) [cacheName=" + cctx.name() +
", key=" + key + ", part=" + part + ", locId=" + cctx.nodeId() + ']');
- // Key has been preloaded or retrieved already.
+ // Key has been rebalanced or retrieved already.
return;
}
}
@@ -308,12 +308,12 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
List<ClusterNode> owners = F.isEmpty(exc) ? top.owners(part, topVer) :
new ArrayList<>(F.view(top.owners(part, topVer), F.notIn(exc)));
- if (owners.isEmpty() || (owners.contains(loc) && cctx.preloadEnabled())) {
+ if (owners.isEmpty() || (owners.contains(loc) && cctx.rebalanceEnabled())) {
if (log.isDebugEnabled())
- log.debug("Will not preload key (local node is owner) [key=" + key + ", part=" + part +
+ log.debug("Will not rebalance key (local node is owner) [key=" + key + ", part=" + part +
"topVer=" + topVer + ", locId=" + cctx.nodeId() + ']');
- // Key is already preloaded.
+ // Key is already rebalanced.
return;
}
@@ -326,7 +326,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
if (locPart == null)
invalidParts.add(part);
- // If preloader is disabled, then local partition is always MOVING.
+ // If rebalance is disabled, then local partition is always MOVING.
else if (locPart.state() == MOVING) {
Collections.sort(owners, CU.nodeComparator(false));
@@ -335,12 +335,12 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
assert pick != null;
- if (!cctx.preloadEnabled() && loc.id().equals(pick.id()))
+ if (!cctx.rebalanceEnabled() && loc.id().equals(pick.id()))
pick = F.first(F.view(owners, F.remoteNodes(loc.id())));
if (pick == null) {
if (log.isDebugEnabled())
- log.debug("Will not preload key (no nodes to request from with preloading disabled) [key=" +
+ log.debug("Will not rebalance key (no nodes to request from with rebalancing disabled) [key=" +
key + ", part=" + part + ", locId=" + cctx.nodeId() + ']');
return;
@@ -353,14 +353,14 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
mappedKeys.add(key);
if (log.isDebugEnabled())
- log.debug("Will preload key from node [cacheName=" + cctx.namex() + ", key=" + key + ", part=" +
+ log.debug("Will rebalance key from node [cacheName=" + cctx.namex() + ", key=" + key + ", part=" +
part + ", node=" + pick.id() + ", locId=" + cctx.nodeId() + ']');
}
else if (locPart.state() != OWNING)
invalidParts.add(part);
else {
if (log.isDebugEnabled())
- log.debug("Will not preload key (local partition is not MOVING) [cacheName=" + cctx.name() +
+ log.debug("Will not rebalance key (local partition is not MOVING) [cacheName=" + cctx.name() +
", key=" + key + ", part=" + locPart + ", locId=" + cctx.nodeId() + ']');
}
}
@@ -477,8 +477,8 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
remapMissed = true;
}
- // If preloading is disabled, we need to check other backups.
- if (!cctx.preloadEnabled()) {
+ // If rebalancing is disabled, we need to check other backups.
+ if (!cctx.rebalanceEnabled()) {
Collection<K> retryKeys = F.view(
keys,
F0.notIn(missedKeys),
@@ -488,7 +488,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
map(retryKeys, F.concat(false, node, exc));
}
- boolean rec = cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ boolean rec = cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED);
boolean replicate = cctx.isDrEnabled();
@@ -513,7 +513,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
)) {
if (rec && !entry.isInternal())
cctx.events().addEvent(entry.partition(), entry.key(), cctx.localNodeId(),
- (IgniteUuid)null, null, EVT_CACHE_PRELOAD_OBJECT_LOADED, info.value(), true, null,
+ (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, info.value(), true, null,
false, null, null, null);
}
}
@@ -524,7 +524,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
}
catch (GridCacheEntryRemovedException ignore) {
if (log.isDebugEnabled())
- log.debug("Trying to preload removed entry (will ignore) [cacheName=" +
+ log.debug("Trying to rebalance removed entry (will ignore) [cacheName=" +
cctx.namex() + ", entry=" + entry + ']');
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index 6a1f7a1..e937757 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -72,7 +72,7 @@ public class GridDhtPartitionDemandPool<K, V> {
/** Preload predicate. */
private IgnitePredicate<GridCacheEntryInfo<K, V>> preloadPred;
- /** Future for preload mode {@link org.apache.ignite.cache.CachePreloadMode#SYNC}. */
+ /** Future for preload mode {@link org.apache.ignite.cache.CacheRebalanceMode#SYNC}. */
@GridToStringInclude
private SyncFuture syncFut;
@@ -107,7 +107,7 @@ public class GridDhtPartitionDemandPool<K, V> {
log = cctx.logger(getClass());
- poolSize = cctx.preloadEnabled() ? cctx.config().getPreloadThreadPoolSize() : 0;
+ poolSize = cctx.rebalanceEnabled() ? cctx.config().getRebalanceThreadPoolSize() : 0;
if (poolSize > 0) {
barrier = new CyclicBarrier(poolSize);
@@ -128,7 +128,7 @@ public class GridDhtPartitionDemandPool<K, V> {
syncFut.onDone();
}
- timeout = new AtomicLong(cctx.config().getPreloadTimeout());
+ timeout = new AtomicLong(cctx.config().getRebalanceTimeout());
}
/**
@@ -161,7 +161,7 @@ public class GridDhtPartitionDemandPool<K, V> {
}
/**
- * @return Future for {@link org.apache.ignite.cache.CachePreloadMode#SYNC} mode.
+ * @return Future for {@link org.apache.ignite.cache.CacheRebalanceMode#SYNC} mode.
*/
IgniteInternalFuture<?> syncFuture() {
return syncFut;
@@ -206,7 +206,7 @@ public class GridDhtPartitionDemandPool<K, V> {
if (exchFut != null) {
if (log.isDebugEnabled())
- log.debug("Forcing preload event for future: " + exchFut);
+ log.debug("Forcing rebalance event for future: " + exchFut);
exchFut.listenAsync(new CI1<IgniteInternalFuture<Long>>() {
@Override public void apply(IgniteInternalFuture<Long> t) {
@@ -215,7 +215,7 @@ public class GridDhtPartitionDemandPool<K, V> {
});
}
else if (log.isDebugEnabled())
- log.debug("Ignoring force preload request (no topology event happened yet).");
+ log.debug("Ignoring force rebalance request (no topology event happened yet).");
}
/**
@@ -330,7 +330,7 @@ public class GridDhtPartitionDemandPool<K, V> {
if (log.isDebugEnabled())
log.debug("Adding partition assignments: " + assigns);
- long delay = cctx.config().getPreloadPartitionedDelay();
+ long delay = cctx.config().getRebalancePartitionedDelay();
if (delay == 0 || force) {
assert assigns != null;
@@ -353,7 +353,7 @@ public class GridDhtPartitionDemandPool<K, V> {
final GridDhtPartitionsExchangeFuture<K, V> exchFut = lastExchangeFut;
- assert exchFut != null : "Delaying preload process without topology event.";
+ assert exchFut != null : "Delaying rebalance process without topology event.";
obj = new GridTimeoutObjectAdapter(delay) {
@Override public void onTimeout() {
@@ -469,7 +469,7 @@ public class GridDhtPartitionDemandPool<K, V> {
// Grow by 50% only if another thread didn't do it already.
if (GridDhtPartitionDemandPool.this.timeout.compareAndSet(timeout, newTimeout))
- U.warn(log, "Increased preloading message timeout from " + timeout + "ms to " +
+ U.warn(log, "Increased rebalancing message timeout from " + timeout + "ms to " +
newTimeout + "ms.");
}
@@ -490,12 +490,12 @@ public class GridDhtPartitionDemandPool<K, V> {
cached = cctx.dht().entryEx(entry.key());
if (log.isDebugEnabled())
- log.debug("Preloading key [key=" + entry.key() + ", part=" + p + ", node=" + pick.id() + ']');
+ log.debug("Rebalancing key [key=" + entry.key() + ", part=" + p + ", node=" + pick.id() + ']');
if (cctx.dht().isIgfsDataCache() &&
cctx.dht().igfsDataSpaceUsed() > cctx.dht().igfsDataSpaceMax()) {
- LT.error(log, null, "Failed to preload IGFS data cache (IGFS space size exceeded maximum " +
- "value, will ignore preload entries): " + name());
+ LT.error(log, null, "Failed to rebalance IGFS data cache (IGFS space size exceeded maximum " +
+ "value, will ignore rebalance entries): " + name());
if (cached.markObsoleteIfEmpty(null))
cached.context().cache().removeIfObsolete(cached.key());
@@ -516,26 +516,26 @@ public class GridDhtPartitionDemandPool<K, V> {
)) {
cctx.evicts().touch(cached, topVer); // Start tracking.
- if (cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_LOADED) && !cached.isInternal())
+ if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED) && !cached.isInternal())
cctx.events().addEvent(cached.partition(), cached.key(), cctx.localNodeId(),
- (IgniteUuid)null, null, EVT_CACHE_PRELOAD_OBJECT_LOADED, entry.value(), true, null,
+ (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, entry.value(), true, null,
false, null, null, null);
}
else if (log.isDebugEnabled())
- log.debug("Preloading entry is already in cache (will ignore) [key=" + cached.key() +
+ log.debug("Rebalancing entry is already in cache (will ignore) [key=" + cached.key() +
", part=" + p + ']');
}
else if (log.isDebugEnabled())
- log.debug("Preload predicate evaluated to false for entry (will ignore): " + entry);
+ log.debug("Rebalance predicate evaluated to false for entry (will ignore): " + entry);
}
catch (GridCacheEntryRemovedException ignored) {
if (log.isDebugEnabled())
- log.debug("Entry has been concurrently removed while preloading (will ignore) [key=" +
+ log.debug("Entry has been concurrently removed while rebalancing (will ignore) [key=" +
cached.key() + ", part=" + p + ']');
}
catch (GridDhtInvalidPartitionException ignored) {
if (log.isDebugEnabled())
- log.debug("Partition became invalid during preloading (will ignore): " + p);
+ log.debug("Partition became invalid during rebalancing (will ignore): " + p);
return false;
}
@@ -544,7 +544,7 @@ public class GridDhtPartitionDemandPool<K, V> {
throw e;
}
catch (IgniteCheckedException e) {
- throw new IgniteCheckedException("Failed to cache preloaded entry (will stop preloading) [local=" +
+ throw new IgniteCheckedException("Failed to cache rebalanced entry (will stop rebalancing) [local=" +
cctx.nodeId() + ", node=" + pick.id() + ", key=" + entry.key() + ", part=" + p + ']', e);
}
@@ -625,7 +625,7 @@ public class GridDhtPartitionDemandPool<K, V> {
if (s == null) {
if (msgQ.isEmpty()) { // Safety check.
U.warn(log, "Timed out waiting for partitions to load, will retry in " + timeout +
- " ms (you may need to increase 'networkTimeout' or 'preloadBatchSize'" +
+ " ms (you may need to increase 'networkTimeout' or 'rebalanceBatchSize'" +
" configuration properties).");
growTimeout(timeout);
@@ -741,10 +741,10 @@ public class GridDhtPartitionDemandPool<K, V> {
top.own(part);
if (log.isDebugEnabled())
- log.debug("Finished preloading partition: " + part);
+ log.debug("Finished rebalancing partition: " + part);
- if (cctx.events().isRecordable(EVT_CACHE_PRELOAD_PART_LOADED))
- preloadEvent(p, EVT_CACHE_PRELOAD_PART_LOADED,
+ if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_LOADED))
+ preloadEvent(p, EVT_CACHE_REBALANCE_PART_LOADED,
exchFut.discoveryEvent());
}
}
@@ -757,14 +757,14 @@ public class GridDhtPartitionDemandPool<K, V> {
remaining.remove(p);
if (log.isDebugEnabled())
- log.debug("Skipping loading partition (state is not MOVING): " + part);
+ log.debug("Skipping rebalancing partition (state is not MOVING): " + part);
}
}
else {
remaining.remove(p);
if (log.isDebugEnabled())
- log.debug("Skipping loading partition (it does not belong on current node): " + p);
+ log.debug("Skipping rebalancing partition (it does not belong on current node): " + p);
}
}
@@ -809,29 +809,29 @@ public class GridDhtPartitionDemandPool<K, V> {
/** {@inheritDoc} */
@Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
try {
- int preloadOrder = cctx.config().getPreloadOrder();
+ int rebalanceOrder = cctx.config().getRebalanceOrder();
- if (preloadOrder > 0) {
- IgniteInternalFuture<?> fut = cctx.kernalContext().cache().orderedPreloadFuture(preloadOrder);
+ if (rebalanceOrder > 0) {
+ IgniteInternalFuture<?> fut = cctx.kernalContext().cache().orderedPreloadFuture(rebalanceOrder);
try {
if (fut != null) {
if (log.isDebugEnabled())
- log.debug("Waiting for dependant caches preload [cacheName=" + cctx.name() +
- ", preloadOrder=" + preloadOrder + ']');
+ log.debug("Waiting for dependant caches rebalance [cacheName=" + cctx.name() +
+ ", rebalanceOrder=" + rebalanceOrder + ']');
fut.get();
}
}
catch (IgniteInterruptedCheckedException ignored) {
if (log.isDebugEnabled())
- log.debug("Failed to wait for ordered preload future (grid is stopping): " +
- "[cacheName=" + cctx.name() + ", preloadOrder=" + preloadOrder + ']');
+ log.debug("Failed to wait for ordered rebalance future (grid is stopping): " +
+ "[cacheName=" + cctx.name() + ", rebalanceOrder=" + rebalanceOrder + ']');
return;
}
catch (IgniteCheckedException e) {
- throw new Error("Ordered preload future should never fail: " + e.getMessage(), e);
+ throw new Error("Ordered rebalance future should never fail: " + e.getMessage(), e);
}
}
@@ -844,10 +844,10 @@ public class GridDhtPartitionDemandPool<K, V> {
barrier.await();
if (id == 0 && exchFut != null && !exchFut.dummy() &&
- cctx.events().isRecordable(EVT_CACHE_PRELOAD_STOPPED)) {
+ cctx.events().isRecordable(EVT_CACHE_REBALANCE_STOPPED)) {
if (!cctx.isReplicated() || !stopEvtFired) {
- preloadEvent(EVT_CACHE_PRELOAD_STOPPED, exchFut.discoveryEvent());
+ preloadEvent(EVT_CACHE_REBALANCE_STOPPED, exchFut.discoveryEvent());
stopEvtFired = true;
}
@@ -908,7 +908,7 @@ public class GridDhtPartitionDemandPool<K, V> {
}
catch (ClusterTopologyCheckedException e) {
if (log.isDebugEnabled())
- log.debug("Node left during preloading (will retry) [node=" + node.id() +
+ log.debug("Node left during rebalancing (will retry) [node=" + node.id() +
", msg=" + e.getMessage() + ']');
resync = true;
@@ -916,7 +916,7 @@ public class GridDhtPartitionDemandPool<K, V> {
break; // For.
}
catch (IgniteCheckedException e) {
- U.error(log, "Failed to receive partitions from node (preloading will not " +
+ U.error(log, "Failed to receive partitions from node (rebalancing will not " +
"fully finish) [node=" + node.id() + ", msg=" + d + ']', e);
}
}
@@ -972,7 +972,7 @@ public class GridDhtPartitionDemandPool<K, V> {
// No assignments for disabled preloader.
GridDhtPartitionTopology<K, V> top = cctx.dht().topology();
- if (!cctx.preloadEnabled())
+ if (!cctx.rebalanceEnabled())
return new GridDhtPreloaderAssignments<>(exchFut, top.topologyVersion());
int partCnt = cctx.affinity().partitions();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index 96292c4..139e73e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -83,7 +83,7 @@ class GridDhtPartitionSupplyPool<K, V> {
top = cctx.dht().topology();
- int poolSize = cctx.preloadEnabled() ? cctx.config().getPreloadThreadPoolSize() : 0;
+ int poolSize = cctx.rebalanceEnabled() ? cctx.config().getRebalanceThreadPoolSize() : 0;
for (int i = 0; i < poolSize; i++)
workers.add(new SupplyWorker());
@@ -128,7 +128,7 @@ class GridDhtPartitionSupplyPool<K, V> {
* @return Size of this thread pool.
*/
int poolSize() {
- return cctx.config().getPreloadThreadPoolSize();
+ return cctx.config().getRebalanceThreadPoolSize();
}
/**
@@ -153,14 +153,14 @@ class GridDhtPartitionSupplyPool<K, V> {
return;
try {
- if (cctx.preloadEnabled()) {
+ if (cctx.rebalanceEnabled()) {
if (log.isDebugEnabled())
log.debug("Received partition demand [node=" + nodeId + ", demand=" + d + ']');
queue.offer(new DemandMessage<>(nodeId, d));
}
else
- U.warn(log, "Received partition demand message when preloading is disabled (will ignore): " + d);
+ U.warn(log, "Received partition demand message when rebalancing is disabled (will ignore): " + d);
}
finally {
leaveBusy();
@@ -243,7 +243,7 @@ class GridDhtPartitionSupplyPool<K, V> {
GridDhtPartitionSupplyMessage<K, V> s = new GridDhtPartitionSupplyMessage<>(d.workerId(),
d.updateSequence(), cctx.cacheId());
- long preloadThrottle = cctx.config().getPreloadThrottle();
+ long preloadThrottle = cctx.config().getRebalanceThrottle();
boolean ack = false;
@@ -296,7 +296,7 @@ class GridDhtPartitionSupplyPool<K, V> {
break;
}
- if (s.messageSize() >= cctx.config().getPreloadBatchSize()) {
+ if (s.messageSize() >= cctx.config().getRebalanceBatchSize()) {
ack = true;
if (!reply(node, d, s))
@@ -316,7 +316,7 @@ class GridDhtPartitionSupplyPool<K, V> {
if (preloadPred == null || preloadPred.apply(info))
s.addEntry(part, info, cctx.shared());
else if (log.isDebugEnabled())
- log.debug("Preload predicate evaluated to false (will not sender cache entry): " +
+ log.debug("Rebalance predicate evaluated to false (will not sender cache entry): " +
info);
}
}
@@ -348,7 +348,7 @@ class GridDhtPartitionSupplyPool<K, V> {
break; // For.
}
- if (s.messageSize() >= cctx.config().getPreloadBatchSize()) {
+ if (s.messageSize() >= cctx.config().getRebalanceBatchSize()) {
ack = true;
if (!reply(node, d, s))
@@ -384,7 +384,7 @@ class GridDhtPartitionSupplyPool<K, V> {
s.addEntry0(part, info, cctx.shared());
else {
if (log.isDebugEnabled())
- log.debug("Preload predicate evaluated to false (will not send " +
+ log.debug("Rebalance predicate evaluated to false (will not send " +
"cache entry): " + info);
continue;
@@ -443,7 +443,7 @@ class GridDhtPartitionSupplyPool<K, V> {
break;
}
- if (s.messageSize() >= cctx.config().getPreloadBatchSize()) {
+ if (s.messageSize() >= cctx.config().getRebalanceBatchSize()) {
ack = true;
if (!reply(node, d, s))
@@ -456,7 +456,7 @@ class GridDhtPartitionSupplyPool<K, V> {
if (preloadPred == null || preloadPred.apply(info))
s.addEntry(part, info, cctx.shared());
else if (log.isDebugEnabled())
- log.debug("Preload predicate evaluated to false (will not sender cache entry): " +
+ log.debug("Rebalance predicate evaluated to false (will not sender cache entry): " +
info);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 0821431..4d79c09 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -126,7 +126,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
/** {@inheritDoc} */
@Override public void start() {
if (log.isDebugEnabled())
- log.debug("Starting DHT preloader...");
+ log.debug("Starting DHT rebalancer...");
cctx.io().addHandler(cctx.cacheId(), GridDhtForceKeysRequest.class,
new MessageHandler<GridDhtForceKeysRequest<K, V>>() {
@@ -165,7 +165,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
/** {@inheritDoc} */
@Override public void onKernalStart() throws IgniteCheckedException {
if (log.isDebugEnabled())
- log.debug("DHT preloader onKernalStart callback.");
+ log.debug("DHT rebalancer onKernalStart callback.");
ClusterNode loc = cctx.localNode();
@@ -202,7 +202,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
@SuppressWarnings( {"LockAcquiredButNotSafelyReleased"})
@Override public void onKernalStop() {
if (log.isDebugEnabled())
- log.debug("DHT preloader onKernalStop callback.");
+ log.debug("DHT rebalancer onKernalStop callback.");
cctx.events().removeListener(discoLsnr);
@@ -225,12 +225,12 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
final long start = U.currentTimeMillis();
- if (cctx.config().getPreloadPartitionedDelay() >= 0) {
- U.log(log, "Starting preloading in " + cctx.config().getPreloadMode() + " mode: " + cctx.name());
+ if (cctx.config().getRebalancePartitionedDelay() >= 0) {
+ U.log(log, "Starting rebalancing in " + cctx.config().getRebalanceMode() + " mode: " + cctx.name());
demandPool.syncFuture().listenAsync(new CI1<Object>() {
@Override public void apply(Object t) {
- U.log(log, "Completed preloading in " + cctx.config().getPreloadMode() + " mode " +
+ U.log(log, "Completed rebalancing in " + cctx.config().getRebalanceMode() + " mode " +
"[cache=" + cctx.name() + ", time=" + (U.currentTimeMillis() - start) + " ms]");
}
});
@@ -472,7 +472,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
try {
top.onEvicted(part, updateSeq);
- if (cctx.events().isRecordable(EVT_CACHE_PRELOAD_PART_UNLOADED))
+ if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_UNLOADED))
cctx.events().addUnloadEvent(part.id());
if (updateSeq)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
index f331789..b04223d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java
@@ -31,7 +31,7 @@ public class VisorCachePreloadConfiguration implements Serializable {
private static final long serialVersionUID = 0L;
/** Cache preload mode. */
- private CachePreloadMode mode;
+ private CacheRebalanceMode mode;
/** Preload thread pool size. */
private int threadPoolSize;
@@ -55,12 +55,12 @@ public class VisorCachePreloadConfiguration implements Serializable {
public static VisorCachePreloadConfiguration from(CacheConfiguration ccfg) {
VisorCachePreloadConfiguration cfg = new VisorCachePreloadConfiguration();
- cfg.mode = ccfg.getPreloadMode();
- cfg.batchSize = ccfg.getPreloadBatchSize();
- cfg.threadPoolSize = ccfg.getPreloadThreadPoolSize();
- cfg.partitionedDelay = ccfg.getPreloadPartitionedDelay();
- cfg.throttle = ccfg.getPreloadThrottle();
- cfg.timeout = ccfg.getPreloadTimeout();
+ cfg.mode = ccfg.getRebalanceMode();
+ cfg.batchSize = ccfg.getRebalanceBatchSize();
+ cfg.threadPoolSize = ccfg.getRebalanceThreadPoolSize();
+ cfg.partitionedDelay = ccfg.getRebalancePartitionedDelay();
+ cfg.throttle = ccfg.getRebalanceThrottle();
+ cfg.timeout = ccfg.getRebalanceTimeout();
return cfg;
}
@@ -68,7 +68,7 @@ public class VisorCachePreloadConfiguration implements Serializable {
/**
* @return Cache preload mode.
*/
- public CachePreloadMode mode() {
+ public CacheRebalanceMode mode() {
return mode;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/discovery-stress.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/discovery-stress.xml b/modules/core/src/test/config/discovery-stress.xml
index 53e7092..96a0e54 100644
--- a/modules/core/src/test/config/discovery-stress.xml
+++ b/modules/core/src/test/config/discovery-stress.xml
@@ -29,7 +29,7 @@
<bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
<property name="distributionMode" value="PARTITIONED_ONLY"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="swapEnabled" value="false"/>
<property name="queryIndexEnabled" value="false"/>
<property name="writeSynchronizationMode" value="FULL_ASYNC"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml
index 1a02fbc..6db2de3 100644
--- a/modules/core/src/test/config/example-cache.xml
+++ b/modules/core/src/test/config/example-cache.xml
@@ -130,8 +130,8 @@
<!-- Initial cache size. -->
<property name="startSize" value="3000000"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
<!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/load/dsi-49-server-production.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-49-server-production.xml b/modules/core/src/test/config/load/dsi-49-server-production.xml
index 07fc164..201509a 100644
--- a/modules/core/src/test/config/load/dsi-49-server-production.xml
+++ b/modules/core/src/test/config/load/dsi-49-server-production.xml
@@ -42,7 +42,7 @@
<property name="name" value="PARTITIONED_CACHE"/>
<property name="cacheMode" value="PARTITIONED"/>
<property name="startSize" value="500000"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="evictionPolicy">
<bean
@@ -72,7 +72,7 @@
<property name="name" value="REPLICATED_CACHE"/>
<property name="cacheMode" value="REPLICATED"/>
<property name="startSize" value="200"/>
- <property name="preloadMode" value="NONE"/>
+ <property name="rebalanceMode" value="NONE"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="swapEnabled" value="false"/>
<property name="indexFixedTyping" value="false"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/load/dsi-load-client.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-client.xml b/modules/core/src/test/config/load/dsi-load-client.xml
index 59f85be..1112a17 100644
--- a/modules/core/src/test/config/load/dsi-load-client.xml
+++ b/modules/core/src/test/config/load/dsi-load-client.xml
@@ -43,7 +43,7 @@
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="startSize" value="200"/>
- <property name="preloadMode" value="NONE"/>
+ <property name="rebalanceMode" value="NONE"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="swapEnabled" value="false"/>
</bean>
@@ -52,7 +52,7 @@
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="startSize" value="200"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="swapEnabled" value="false"/>
<property name="atomicSequenceReserveSize" value="100000"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/load/dsi-load-server.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-server.xml b/modules/core/src/test/config/load/dsi-load-server.xml
index a6439e7..f66eb24 100644
--- a/modules/core/src/test/config/load/dsi-load-server.xml
+++ b/modules/core/src/test/config/load/dsi-load-server.xml
@@ -42,7 +42,7 @@
<property name="cacheMode" value="REPLICATED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="startSize" value="200"/>
- <property name="preloadMode" value="NONE"/>
+ <property name="rebalanceMode" value="NONE"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<property name="swapEnabled" value="false"/>
</bean>
@@ -51,7 +51,7 @@
<property name="cacheMode" value="PARTITIONED"/>
<property name="atomicityMode" value="TRANSACTIONAL"/>
<property name="startSize" value="200"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
<!--Eviction settings-->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/spring-cache-load.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml
index 6067317..48f662f 100644
--- a/modules/core/src/test/config/spring-cache-load.xml
+++ b/modules/core/src/test/config/spring-cache-load.xml
@@ -51,7 +51,7 @@
<bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="cacheMode" value="PARTITIONED"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml
index 9d9f959..7c84eee 100644
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@ -70,7 +70,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -92,7 +92,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -114,7 +114,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -136,7 +136,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -159,7 +159,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -181,7 +181,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -203,7 +203,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
@@ -225,7 +225,7 @@
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
<property name="evictionPolicy">
<bean class="org.apache.ignite.cache.eviction.lru.CacheLruEvictionPolicy">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/websession/spring-cache-1.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml
index 2bc770a..b5ca38f 100644
--- a/modules/core/src/test/config/websession/spring-cache-1.xml
+++ b/modules/core/src/test/config/websession/spring-cache-1.xml
@@ -46,7 +46,7 @@
<property name="backups" value="1"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -64,7 +64,7 @@
<property name="backups" value="1"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -78,7 +78,7 @@
<property name="atomicWriteOrderMode" value="PRIMARY"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/websession/spring-cache-2.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml
index ca9d66b..9d07f04 100644
--- a/modules/core/src/test/config/websession/spring-cache-2.xml
+++ b/modules/core/src/test/config/websession/spring-cache-2.xml
@@ -46,7 +46,7 @@
<property name="backups" value="1"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -64,7 +64,7 @@
<property name="backups" value="1"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -78,7 +78,7 @@
<property name="atomicWriteOrderMode" value="PRIMARY"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/config/websession/spring-cache-3.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml
index 8354836..f2f316d 100644
--- a/modules/core/src/test/config/websession/spring-cache-3.xml
+++ b/modules/core/src/test/config/websession/spring-cache-3.xml
@@ -46,7 +46,7 @@
<property name="backups" value="1"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -64,7 +64,7 @@
<property name="backups" value="1"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -78,7 +78,7 @@
<property name="atomicWriteOrderMode" value="PRIMARY"/>
- <property name="preloadMode" value="SYNC"/>
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index 433f9fa..b04ad78 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -35,7 +35,7 @@ import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -83,7 +83,7 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
cCfg.setCacheMode(PARTITIONED);
cCfg.setBackups(1);
cCfg.setDistributionMode(NEAR_PARTITIONED);
- cCfg.setPreloadMode(SYNC);
+ cCfg.setRebalanceMode(SYNC);
cCfg.setQueryIndexEnabled(false);
cCfg.setWriteSynchronizationMode(FULL_SYNC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index f75d7d2..fa9a0c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import java.util.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -76,7 +76,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
@Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
CacheConfiguration cfg = super.cacheConfiguration(gridName);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
index b80b201..69bcef2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java
@@ -34,7 +34,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -89,7 +89,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract
cc.setSwapEnabled(false);
cc.setAtomicityMode(atomicityMode());
cc.setDistributionMode(distributionMode());
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
cc.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 06904e5..3acfd94 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -117,7 +117,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
cc.setEvictNearSynchronized(false);
cc.setSwapEnabled(false);
cc.setWriteSynchronizationMode(FULL_SYNC);
- cc.setPreloadMode(NONE);
+ cc.setRebalanceMode(NONE);
c.setCacheConfiguration(cc);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
index 3bd42dc..475a257 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
@@ -48,7 +48,7 @@ import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -330,14 +330,14 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
new C1<CacheConfiguration, Void>() {
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
- cfg.setPreloadMode(NONE);
+ cfg.setRebalanceMode(NONE);
return null;
}
},
new C1<CacheConfiguration, Void>() {
/** {@inheritDoc} */
@Override public Void apply(CacheConfiguration cfg) {
- cfg.setPreloadMode(ASYNC);
+ cfg.setRebalanceMode(ASYNC);
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
index 8e5474a..30a9ba6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -81,7 +81,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract
CacheConfiguration dfltCacheCfg = defaultCacheConfiguration();
dfltCacheCfg.setCacheMode(PARTITIONED);
- dfltCacheCfg.setPreloadMode(ASYNC);
+ dfltCacheCfg.setRebalanceMode(ASYNC);
dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
dfltCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction());
@@ -89,14 +89,14 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract
CacheConfiguration namedCacheCfg = defaultCacheConfiguration();
namedCacheCfg.setCacheMode(PARTITIONED);
- namedCacheCfg.setPreloadMode(ASYNC);
+ namedCacheCfg.setRebalanceMode(ASYNC);
namedCacheCfg.setWriteSynchronizationMode(FULL_SYNC);
namedCacheCfg.setName(NON_DFLT_CACHE_NAME);
namedCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction());
// Modify cache config according to test parameters.
if (gridName.contains(WRONG_PRELOAD_MODE_GRID_NAME))
- dfltCacheCfg.setPreloadMode(SYNC);
+ dfltCacheCfg.setRebalanceMode(SYNC);
else if (gridName.contains(WRONG_CACHE_MODE_GRID_NAME))
dfltCacheCfg.setCacheMode(REPLICATED);
else if (gridName.contains(WRONG_AFFINITY_GRID_NAME)) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index 2f1e9b0..8b5f3ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -33,7 +33,7 @@ import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -101,7 +101,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
cfg.setCacheMode(PARTITIONED);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
cfg.setStoreValueBytes(true);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
index 06c5b84..d890da9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -87,7 +87,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm
cc.setSwapEnabled(false);
cc.setAtomicityMode(atomicityMode());
cc.setDistributionMode(distributionMode());
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
cc.setReadThrough(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
index 320a2b6..6950d5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java
@@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -67,7 +67,7 @@ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest {
cache.setAtomicWriteOrderMode(PRIMARY);
cache.setWriteSynchronizationMode(FULL_SYNC);
cache.setBackups(1);
- cache.setPreloadMode(SYNC);
+ cache.setRebalanceMode(SYNC);
cfg.setCacheConfiguration(cache);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
index 750daef..0fcbaef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@ -77,7 +77,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest {
cfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
index 7d81b98..81ee250 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Checks ordered preloading.
@@ -80,8 +80,8 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest {
cfg.setName(name);
cfg.setCacheMode(cacheMode);
- cfg.setPreloadOrder(preloadOrder);
- cfg.setPreloadMode(ASYNC);
+ cfg.setRebalanceOrder(preloadOrder);
+ cfg.setRebalanceMode(ASYNC);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
index ea99af2..44c290f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
/**
@@ -57,7 +57,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
private final AtomicInteger idxGen = new AtomicInteger();
/** */
- private CachePreloadMode mode = SYNC;
+ private CacheRebalanceMode mode = SYNC;
/** */
private boolean offheap;
@@ -82,7 +82,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
repCacheCfg.setName("replicated");
repCacheCfg.setCacheMode(REPLICATED);
- repCacheCfg.setPreloadMode(mode);
+ repCacheCfg.setRebalanceMode(mode);
repCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
repCacheCfg.setQueryIndexEnabled(false);
repCacheCfg.setAtomicityMode(TRANSACTIONAL);
@@ -96,7 +96,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
partCacheCfg.setName("partitioned");
partCacheCfg.setCacheMode(PARTITIONED);
- partCacheCfg.setPreloadMode(mode);
+ partCacheCfg.setRebalanceMode(mode);
partCacheCfg.setAffinity(new GridCacheModuloAffinityFunction(11, 1));
partCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
partCacheCfg.setEvictNearSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 860bed5..85fca1a 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
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.internal.GridTopic.*;
@@ -86,7 +86,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
cc.setCacheMode(PARTITIONED);
cc.setBackups(1);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setSwapEnabled(true);
cc.setEvictNearSynchronized(false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
index 30e381e..56a4168 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java
@@ -31,7 +31,7 @@ import org.apache.ignite.testframework.junits.common.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Partitioned affinity test for projections.
@@ -56,7 +56,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setBackups(BACKUPS);
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setDistributionMode(NEAR_PARTITIONED);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 c621827..742a70e 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
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.events.EventType.*;
@@ -78,11 +78,11 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest
partCacheCfg.setEvictionPolicy(null);
partCacheCfg.setEvictSynchronizedKeyBufferSize(25);
partCacheCfg.setEvictMaxOverflowRatio(0.99f);
- partCacheCfg.setPreloadMode(ASYNC);
+ partCacheCfg.setRebalanceMode(ASYNC);
partCacheCfg.setAtomicityMode(TRANSACTIONAL);
// This test requires artificial slowing down of the preloading.
- partCacheCfg.setPreloadThrottle(2000);
+ partCacheCfg.setRebalanceThrottle(2000);
cfg.setCacheConfiguration(partCacheCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
index 6c0c583..63f9ef9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Cache query internal keys self test.
@@ -57,7 +57,7 @@ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTes
CacheConfiguration cc = super.cacheConfiguration(gridName);
cc.setQueryIndexEnabled(false);
- cc.setPreloadMode(SYNC);
+ cc.setRebalanceMode(SYNC);
return cc;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
index 85a7838..5063ae2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
/**
* Test for cache swap preloading.
@@ -65,7 +65,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest {
cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
cacheCfg.setSwapEnabled(true);
cacheCfg.setCacheMode(cacheMode);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setEvictSynchronized(false);
cacheCfg.setEvictNearSynchronized(false);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index f8fa6b8..0ec068e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -60,7 +60,7 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setMemoryMode(memMode);
ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024);
- ccfg.setPreloadMode(CachePreloadMode.SYNC);
+ ccfg.setRebalanceMode(CacheRebalanceMode.SYNC);
return ccfg;
}
[4/4] incubator-ignite git commit: IGNITE-383 Rename preload to
rebalance.
Posted by sb...@apache.org.
IGNITE-383 Rename preload to rebalance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc04e98c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc04e98c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc04e98c
Branch: refs/heads/ignite-383
Commit: dc04e98c616ec68f13d591c1536fb2b275f20744
Parents: 11efb91
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Mon Mar 2 16:53:06 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Mon Mar 2 16:56:02 2015 +0300
----------------------------------------------------------------------
examples/config/example-cache.xml | 4 +-
.../MemcacheRestExampleNodeStartup.java | 5 +-
.../clients/src/test/resources/spring-cache.xml | 8 +-
.../apache/ignite/cache/CachePreloadMode.java | 67 ------
.../apache/ignite/cache/CacheRebalanceMode.java | 67 ++++++
.../java/org/apache/ignite/cache/GridCache.java | 14 +-
.../configuration/CacheConfiguration.java | 232 +++++++++----------
.../ignite/events/CachePreloadingEvent.java | 172 --------------
.../ignite/events/CacheRebalancingEvent.java | 172 ++++++++++++++
.../java/org/apache/ignite/events/Event.java | 2 +-
.../org/apache/ignite/events/EventType.java | 46 ++--
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../processors/cache/GridCacheAttributes.java | 32 +--
.../processors/cache/GridCacheContext.java | 8 +-
.../processors/cache/GridCacheEventManager.java | 12 +-
.../cache/GridCacheEvictionManager.java | 6 +-
.../GridCachePartitionExchangeManager.java | 6 +-
.../processors/cache/GridCacheProcessor.java | 74 +++---
.../processors/cache/GridCacheUtils.java | 4 +-
.../distributed/dht/GridDhtLocalPartition.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 14 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 4 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 30 +--
.../preloader/GridDhtPartitionDemandPool.java | 76 +++---
.../preloader/GridDhtPartitionSupplyPool.java | 22 +-
.../dht/preloader/GridDhtPreloader.java | 14 +-
.../cache/VisorCachePreloadConfiguration.java | 16 +-
.../core/src/test/config/discovery-stress.xml | 2 +-
modules/core/src/test/config/example-cache.xml | 4 +-
.../config/load/dsi-49-server-production.xml | 4 +-
.../src/test/config/load/dsi-load-client.xml | 4 +-
.../src/test/config/load/dsi-load-server.xml | 4 +-
.../core/src/test/config/spring-cache-load.xml | 2 +-
.../core/src/test/config/spring-multicache.xml | 16 +-
.../test/config/websession/spring-cache-1.xml | 6 +-
.../test/config/websession/spring-cache-2.xml | 6 +-
.../test/config/websession/spring-cache-3.xml | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 4 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 4 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 4 +-
...idCacheConfigurationConsistencySelfTest.java | 6 +-
...ridCacheConfigurationValidationSelfTest.java | 8 +-
.../cache/GridCacheDeploymentSelfTest.java | 4 +-
...idCacheGetAndTransformStoreAbstractTest.java | 4 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +-
.../GridCacheOrderedPreloadingSelfTest.java | 6 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 8 +-
.../cache/GridCachePartitionedGetSelfTest.java | 4 +-
...hePartitionedProjectionAffinitySelfTest.java | 4 +-
.../GridCachePreloadingEvictionsSelfTest.java | 6 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 4 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 2 +-
...idCacheValueConsistencyAbstractSelfTest.java | 4 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 2 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 2 +-
.../IgniteCollectionAbstractTest.java | 4 +-
...GridCachePartitionedNodeRestartSelfTest.java | 4 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 4 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 6 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 4 +-
...acheEntrySetIterationPreloadingSelfTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 6 +-
.../distributed/GridCacheLockAbstractTest.java | 4 +-
...dCacheMultithreadedFailoverAbstractTest.java | 4 +-
...dCachePartitionedAffinityFilterSelfTest.java | 4 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 8 +-
.../GridCachePreloadLifecycleAbstractTest.java | 6 +-
...GridCachePreloadRestartAbstractSelfTest.java | 10 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 4 +-
.../IgniteTxPreloadAbstractTest.java | 4 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 4 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtMappingSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 20 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 8 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 28 +--
.../GridCacheDhtPreloadStartStopSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 10 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 4 +-
...idCachePartitionedPreloadEventsSelfTest.java | 8 +-
...dCachePartitionedTopologyChangeSelfTest.java | 4 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 13 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 4 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +-
...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +-
.../near/GridCacheNearEvictionSelfTest.java | 7 +-
.../near/GridCacheNearMultiGetSelfTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../near/GridCacheNearReadersSelfTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 4 +-
.../GridCachePartitionedBasicOpSelfTest.java | 2 +-
.../near/GridCachePartitionedEventSelfTest.java | 4 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
.../GridCachePartitionedMetricsSelfTest.java | 4 +-
...achePartitionedMultiNodeCounterSelfTest.java | 4 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 4 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 2 +-
...achePartitionedTxSingleThreadedSelfTest.java | 4 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 4 +-
.../GridCacheReplicatedNodeRestartSelfTest.java | 6 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 6 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +-
.../GridCacheReplicatedPreloadSelfTest.java | 16 +-
...eplicatedPreloadStartStopEventsSelfTest.java | 6 +-
.../GridCacheEvictionFilterSelfTest.java | 4 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 4 +-
...heNearOnlyLruNearEvictionPolicySelfTest.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 4 +-
.../processors/igfs/IgfsSizeSelfTest.java | 8 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 4 +-
.../capacity/spring-capacity-cache.xml | 4 +-
.../loadtests/colocation/spring-colocation.xml | 4 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 2 +-
.../GridP2PContinuousDeploymentSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../junits/common/GridCommonAbstractTest.java | 4 +-
.../webapp/META-INF/ignite-webapp-config.xml | 12 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 4 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 4 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +-
.../GridCacheCrossCacheQuerySelfTestNewApi.java | 4 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +-
.../near/GridCacheQueryNodeRestartSelfTest.java | 6 +-
.../query/h2/sql/GridQueryParsingTest.java | 5 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
.../commands/events/VisorEventsCommand.scala | 4 +-
.../scala/org/apache/ignite/visor/visor.scala | 4 +-
147 files changed, 864 insertions(+), 874 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index 2ccecf9..8c7fee5 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -140,8 +140,8 @@
<!-- Initial cache size. -->
<property name="startSize" value="3000000"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
<!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
<property name="writeSynchronizationMode" value="FULL_SYNC"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index 1b2b41e..b856fc4 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -18,7 +18,6 @@
package org.apache.ignite.examples.misc.client.memcache;
import org.apache.ignite.*;
-import org.apache.ignite.cache.query.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -27,7 +26,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import java.util.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
@@ -73,7 +72,7 @@ public class MemcacheRestExampleNodeStartup {
cacheCfg.setAtomicityMode(TRANSACTIONAL);
cacheCfg.setWriteSynchronizationMode(FULL_SYNC);
- cacheCfg.setPreloadMode(SYNC);
+ cacheCfg.setRebalanceMode(SYNC);
cacheCfg.setAtomicityMode(TRANSACTIONAL);
CacheQueryConfiguration qryCfg = new CacheQueryConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index d34e3cc..b815c5d 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -99,8 +99,8 @@
-->
<property name="backups" value="1"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
</bean>
<!--
@@ -121,8 +121,8 @@
<!-- REPLICATED cache mode. -->
<property name="cacheMode" value="REPLICATED"/>
- <!-- Set synchronous preloading (default is asynchronous). -->
- <property name="preloadMode" value="SYNC"/>
+ <!-- Set synchronous rebalancing (default is asynchronous). -->
+ <property name="rebalanceMode" value="SYNC"/>
<!-- Initial cache size. -->
<property name="startSize" value="150000"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/cache/CachePreloadMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePreloadMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePreloadMode.java
deleted file mode 100644
index 522bd32..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachePreloadMode.java
+++ /dev/null
@@ -1,67 +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.cache;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Cache preload mode. When preloading is enabled (i.e. has value other than {@link #NONE}), distributed caches
- * will attempt to preload all necessary values from other grid nodes. This enumeration is used to configure
- * preloading via {@link org.apache.ignite.configuration.CacheConfiguration#getPreloadMode()} configuration property. If not configured
- * explicitly, then {@link org.apache.ignite.configuration.CacheConfiguration#DFLT_PRELOAD_MODE} is used.
- * <p>
- * Replicated caches will try to load the full set of cache entries from other nodes (or as defined by
- * pluggable {@link org.apache.ignite.cache.affinity.CacheAffinityFunction}), while partitioned caches will only load the entries for which
- * current node is primary or back up.
- * <p>
- * Note that preload mode only makes sense for {@link CacheMode#REPLICATED} and {@link CacheMode#PARTITIONED}
- * caches. Caches with {@link CacheMode#LOCAL} mode are local by definition and therefore cannot preload
- * any values from neighboring nodes.
- */
-public enum CachePreloadMode {
- /**
- * Synchronous preload mode. Distributed caches will not start until all necessary data
- * is loaded from other available grid nodes.
- */
- SYNC,
-
- /**
- * Asynchronous preload mode. Distributed caches will start immediately and will load all necessary
- * data from other available grid nodes in the background.
- */
- ASYNC,
-
- /**
- * In this mode no preloading will take place which means that caches will be either loaded on
- * demand from persistent store whenever data is accessed, or will be populated explicitly.
- */
- NONE;
-
- /** Enumerated values. */
- private static final CachePreloadMode[] VALS = values();
-
- /**
- * Efficiently gets enumerated value from its ordinal.
- *
- * @param ord Ordinal value.
- * @return Enumerated value or {@code null} if ordinal out of range.
- */
- @Nullable public static CachePreloadMode fromOrdinal(int ord) {
- return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
new file mode 100644
index 0000000..90d9ba4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java
@@ -0,0 +1,67 @@
+/*
+ * 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.cache;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Cache rebalance mode. When rebalancing is enabled (i.e. has value other than {@link #NONE}), distributed caches
+ * will attempt to rebalance all necessary values from other grid nodes. This enumeration is used to configure
+ * rebalancing via {@link org.apache.ignite.configuration.CacheConfiguration#getRebalanceMode()} configuration property. If not configured
+ * explicitly, then {@link org.apache.ignite.configuration.CacheConfiguration#DFLT_REBALANCE_MODE} is used.
+ * <p>
+ * Replicated caches will try to load the full set of cache entries from other nodes (or as defined by
+ * pluggable {@link org.apache.ignite.cache.affinity.CacheAffinityFunction}), while partitioned caches will only load the entries for which
+ * current node is primary or back up.
+ * <p>
+ * Note that rebalance mode only makes sense for {@link CacheMode#REPLICATED} and {@link CacheMode#PARTITIONED}
+ * caches. Caches with {@link CacheMode#LOCAL} mode are local by definition and therefore cannot rebalance
+ * any values from neighboring nodes.
+ */
+public enum CacheRebalanceMode {
+ /**
+ * Synchronous rebalance mode. Distributed caches will not start until all necessary data
+ * is loaded from other available grid nodes.
+ */
+ SYNC,
+
+ /**
+ * Asynchronous rebalance mode. Distributed caches will start immediately and will load all necessary
+ * data from other available grid nodes in the background.
+ */
+ ASYNC,
+
+ /**
+ * In this mode no rebalancing will take place which means that caches will be either loaded on
+ * demand from persistent store whenever data is accessed, or will be populated explicitly.
+ */
+ NONE;
+
+ /** Enumerated values. */
+ private static final CacheRebalanceMode[] VALS = values();
+
+ /**
+ * Efficiently gets enumerated value from its ordinal.
+ *
+ * @param ord Ordinal value.
+ * @return Enumerated value or {@code null} if ordinal out of range.
+ */
+ @Nullable public static CacheRebalanceMode fromOrdinal(int ord) {
+ return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
index 8bbea1f..ee1762e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java
@@ -19,11 +19,9 @@ package org.apache.ignite.cache;
import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.store.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.lang.*;
import org.apache.ignite.mxbean.*;
import org.apache.ignite.transactions.*;
import org.jetbrains.annotations.*;
@@ -201,23 +199,23 @@ public interface GridCache<K, V> extends CacheProjection<K, V> {
/**
* Forces this cache node to re-balance its partitions. This method is usually used when
- * {@link CacheConfiguration#getPreloadPartitionedDelay()} configuration parameter has non-zero value.
+ * {@link CacheConfiguration#getRebalancePartitionedDelay()} configuration parameter has non-zero value.
* When many nodes are started or stopped almost concurrently, it is more efficient to delay
- * preloading until the node topology is stable to make sure that no redundant re-partitioning
+ * rebalancing until the node topology is stable to make sure that no redundant re-partitioning
* happens.
* <p>
* In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should
* usually make sure that new nodes get placed on the same place of consistent hash ring as
* the left nodes, and that nodes are restarted before
- * {@link CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes
+ * {@link CacheConfiguration#getRebalancePartitionedDelay() rebalanceDelay} expires. To place nodes
* on the same place in consistent hash ring, use
* {@link org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction#setHashIdResolver(org.apache.ignite.cache.affinity.CacheAffinityNodeHashResolver)} to make sure that
* a node maps to the same hash ID if re-started.
* <p>
- * See {@link org.apache.ignite.configuration.CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure
- * preload re-partition delay.
+ * See {@link org.apache.ignite.configuration.CacheConfiguration#getRebalancePartitionedDelay()} for more information on how to configure
+ * rebalance re-partition delay.
* <p>
- * @return Future that will be completed when preloading is finished.
+ * @return Future that will be completed when rebalancing is finished.
*/
public IgniteInternalFuture<?> forceRepartition();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 57583d4..f8186bc 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
@@ -43,14 +43,14 @@ import java.util.*;
*/
@SuppressWarnings("RedundantFieldInitialization")
public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
- /** Default size of preload thread pool. */
- public static final int DFLT_PRELOAD_THREAD_POOL_SIZE = 2;
+ /** Default size of rebalance thread pool. */
+ public static final int DFLT_REBALANCE_THREAD_POOL_SIZE = 2;
- /** Default preload timeout (ms).*/
- public static final long DFLT_PRELOAD_TIMEOUT = 10000;
+ /** Default rebalance timeout (ms).*/
+ public static final long DFLT_REBALANCE_TIMEOUT = 10000;
- /** Time in milliseconds to wait between preload messages to avoid overloading CPU. */
- public static final long DFLT_PRELOAD_THROTTLE = 0;
+ /** Time in milliseconds to wait between rebalance messages to avoid overloading CPU. */
+ public static final long DFLT_REBALANCE_THROTTLE = 0;
/**
* Default time to live. The value is <tt>0</tt> which means that
@@ -91,11 +91,11 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Default value for 'storeValueBytes' flag indicating if value bytes should be stored. */
public static final boolean DFLT_STORE_VALUE_BYTES = true;
- /** Default preload mode for distributed cache. */
- public static final CachePreloadMode DFLT_PRELOAD_MODE = CachePreloadMode.ASYNC;
+ /** Default rebalance mode for distributed cache. */
+ public static final CacheRebalanceMode DFLT_REBALANCE_MODE = CacheRebalanceMode.ASYNC;
- /** Default preload batch size in bytes. */
- public static final int DFLT_PRELOAD_BATCH_SIZE = 512 * 1024; // 512K
+ /** Default rebalance batch size in bytes. */
+ public static final int DFLT_REBALANCE_BATCH_SIZE = 512 * 1024; // 512K
/** Default maximum eviction queue ratio. */
public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
@@ -163,11 +163,11 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Cache name. */
private String name;
- /** Preload thread pool size. */
- private int preloadPoolSize = DFLT_PRELOAD_THREAD_POOL_SIZE;
+ /** Rebalance thread pool size. */
+ private int rebalancePoolSize = DFLT_REBALANCE_THREAD_POOL_SIZE;
- /** Preload timeout. */
- private long preloadTimeout = DFLT_PRELOAD_TIMEOUT;
+ /** Rebalance timeout. */
+ private long rebalanceTimeout = DFLT_REBALANCE_TIMEOUT;
/** Default time to live for cache entries. */
private long ttl = DFLT_TIME_TO_LIVE;
@@ -250,14 +250,14 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** Name of class implementing GridCacheTmLookup. */
private String tmLookupClsName;
- /** Distributed cache preload mode. */
- private CachePreloadMode preloadMode = DFLT_PRELOAD_MODE;
+ /** Distributed cache rebalance mode. */
+ private CacheRebalanceMode rebalanceMode = DFLT_REBALANCE_MODE;
- /** Cache preload order. */
- private int preloadOrder;
+ /** Cache rebalance order. */
+ private int rebalanceOrder;
- /** Preload batch size. */
- private int preloadBatchSize = DFLT_PRELOAD_BATCH_SIZE;
+ /** Rebalance batch size. */
+ private int rebalanceBatchSize = DFLT_REBALANCE_BATCH_SIZE;
/** Off-heap memory size. */
private long offHeapMaxMem = DFLT_OFFHEAP_MEMORY;
@@ -299,10 +299,10 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
private String indexingSpiName;
/** */
- private long preloadDelay;
+ private long rebalanceDelay;
/** */
- private long preloadThrottle = DFLT_PRELOAD_THROTTLE;
+ private long rebalanceThrottle = DFLT_REBALANCE_THROTTLE;
/** */
private CacheInterceptor<?, ?> interceptor;
@@ -376,13 +376,13 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
name = cc.getName();
nearStartSize = cc.getNearStartSize();
nearEvictPlc = cc.getNearEvictionPolicy();
- preloadMode = cc.getPreloadMode();
- preloadBatchSize = cc.getPreloadBatchSize();
- preloadDelay = cc.getPreloadPartitionedDelay();
- preloadOrder = cc.getPreloadOrder();
- preloadPoolSize = cc.getPreloadThreadPoolSize();
- preloadTimeout = cc.getPreloadTimeout();
- preloadThrottle = cc.getPreloadThrottle();
+ rebalanceMode = cc.getRebalanceMode();
+ rebalanceBatchSize = cc.getRebalanceBatchSize();
+ rebalanceDelay = cc.getRebalancePartitionedDelay();
+ rebalanceOrder = cc.getRebalanceOrder();
+ rebalancePoolSize = cc.getRebalanceThreadPoolSize();
+ rebalanceTimeout = cc.getRebalanceTimeout();
+ rebalanceThrottle = cc.getRebalanceThrottle();
qryCfg = cc.getQueryConfiguration();
qryIdxEnabled = cc.isQueryIndexEnabled();
readFromBackup = cc.isReadFromBackup();
@@ -1033,73 +1033,73 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Sets cache preload mode.
+ * Sets cache rebalance mode.
*
- * @param preloadMode Preload mode.
+ * @param rebalanceMode Rebalance mode.
*/
- public void setPreloadMode(CachePreloadMode preloadMode) {
- this.preloadMode = preloadMode;
+ public void setRebalanceMode(CacheRebalanceMode rebalanceMode) {
+ this.rebalanceMode = rebalanceMode;
}
/**
- * Gets preload mode for distributed cache.
+ * Gets rebalance mode for distributed cache.
* <p>
- * Default is defined by {@link #DFLT_PRELOAD_MODE}.
+ * Default is defined by {@link #DFLT_REBALANCE_MODE}.
*
- * @return Preload mode.
+ * @return Rebalance mode.
*/
- public CachePreloadMode getPreloadMode() {
- return preloadMode;
+ public CacheRebalanceMode getRebalanceMode() {
+ return rebalanceMode;
}
/**
- * Gets cache preload order. Preload order can be set to non-zero value for caches with
- * {@link CachePreloadMode#SYNC SYNC} or {@link CachePreloadMode#ASYNC ASYNC} preload modes only.
+ * Gets cache rebalance order. Rebalance order can be set to non-zero value for caches with
+ * {@link CacheRebalanceMode#SYNC SYNC} or {@link CacheRebalanceMode#ASYNC ASYNC} rebalance modes only.
* <p/>
- * If cache preload order is positive, preloading for this cache will be started only when preloading for
- * all caches with smaller preload order (except caches with preload order {@code 0}) will be completed.
+ * If cache rebalance order is positive, rebalancing for this cache will be started only when rebalancing for
+ * all caches with smaller rebalance order (except caches with rebalance order {@code 0}) will be completed.
* <p/>
* Note that cache with order {@code 0} does not participate in ordering. This means that cache with
- * preload order {@code 1} will never wait for any other caches. All caches with order {@code 0} will
- * be preloaded right away concurrently with each other and ordered preload processes.
+ * rebalance order {@code 1} will never wait for any other caches. All caches with order {@code 0} will
+ * be rebalanced right away concurrently with each other and ordered rebalance processes.
* <p/>
- * If not set, cache order is 0, i.e. preloading is not ordered.
+ * If not set, cache order is 0, i.e. rebalancing is not ordered.
*
- * @return Cache preload order.
+ * @return Cache rebalance order.
*/
- public int getPreloadOrder() {
- return preloadOrder;
+ public int getRebalanceOrder() {
+ return rebalanceOrder;
}
/**
- * Sets cache preload order.
+ * Sets cache rebalance order.
*
- * @param preloadOrder Cache preload order.
- * @see #getPreloadOrder()
+ * @param rebalanceOrder Cache rebalance order.
+ * @see #getRebalanceOrder()
*/
- public void setPreloadOrder(int preloadOrder) {
- this.preloadOrder = preloadOrder;
+ public void setRebalanceOrder(int rebalanceOrder) {
+ this.rebalanceOrder = rebalanceOrder;
}
/**
- * Gets size (in number bytes) to be loaded within a single preload message.
- * Preloading algorithm will split total data set on every node into multiple
+ * Gets size (in number bytes) to be loaded within a single rebalance message.
+ * Rebalancing algorithm will split total data set on every node into multiple
* batches prior to sending data. Default value is defined by
- * {@link #DFLT_PRELOAD_BATCH_SIZE}.
+ * {@link #DFLT_REBALANCE_BATCH_SIZE}.
*
- * @return Size in bytes of a single preload message.
+ * @return Size in bytes of a single rebalance message.
*/
- public int getPreloadBatchSize() {
- return preloadBatchSize;
+ public int getRebalanceBatchSize() {
+ return rebalanceBatchSize;
}
/**
- * Sets preload batch size.
+ * Sets rebalance batch size.
*
- * @param preloadBatchSize Preload batch size.
+ * @param rebalanceBatchSize Rebalance batch size.
*/
- public void setPreloadBatchSize(int preloadBatchSize) {
- this.preloadBatchSize = preloadBatchSize;
+ public void setRebalanceBatchSize(int rebalanceBatchSize) {
+ this.rebalanceBatchSize = rebalanceBatchSize;
}
/**
@@ -1292,54 +1292,54 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
- * Gets size of preloading thread pool. Note that size serves as a hint and implementation
- * may create more threads for preloading than specified here (but never less threads).
+ * Gets size of rebalancing thread pool. Note that size serves as a hint and implementation
+ * may create more threads for rebalancing than specified here (but never less threads).
* <p>
- * Default value is {@link #DFLT_PRELOAD_THREAD_POOL_SIZE}.
+ * Default value is {@link #DFLT_REBALANCE_THREAD_POOL_SIZE}.
*
- * @return Size of preloading thread pool.
+ * @return Size of rebalancing thread pool.
*/
- public int getPreloadThreadPoolSize() {
- return preloadPoolSize;
+ public int getRebalanceThreadPoolSize() {
+ return rebalancePoolSize;
}
/**
- * Sets size of preloading thread pool. Note that size serves as a hint and implementation may create more threads
- * for preloading than specified here (but never less threads).
+ * Sets size of rebalancing thread pool. Note that size serves as a hint and implementation may create more threads
+ * for rebalancing than specified here (but never less threads).
*
- * @param preloadPoolSize Size of preloading thread pool.
+ * @param rebalancePoolSize Size of rebalancing thread pool.
*/
- public void setPreloadThreadPoolSize(int preloadPoolSize) {
- this.preloadPoolSize = preloadPoolSize;
+ public void setRebalanceThreadPoolSize(int rebalancePoolSize) {
+ this.rebalancePoolSize = rebalancePoolSize;
}
/**
- * Gets preload timeout (ms).
+ * Gets rebalance timeout (ms).
* <p>
- * Default value is {@link #DFLT_PRELOAD_TIMEOUT}.
+ * Default value is {@link #DFLT_REBALANCE_TIMEOUT}.
*
- * @return Preload timeout (ms).
+ * @return Rebalance timeout (ms).
*/
- public long getPreloadTimeout() {
- return preloadTimeout;
+ public long getRebalanceTimeout() {
+ return rebalanceTimeout;
}
/**
- * Sets preload timeout (ms).
+ * Sets rebalance timeout (ms).
*
- * @param preloadTimeout Preload timeout (ms).
+ * @param rebalanceTimeout Rebalance timeout (ms).
*/
- public void setPreloadTimeout(long preloadTimeout) {
- this.preloadTimeout = preloadTimeout;
+ public void setRebalanceTimeout(long rebalanceTimeout) {
+ this.rebalanceTimeout = rebalanceTimeout;
}
/**
- * Gets delay in milliseconds upon a node joining or leaving topology (or crash) after which preloading
- * should be started automatically. Preloading should be delayed if you plan to restart nodes
+ * Gets delay in milliseconds upon a node joining or leaving topology (or crash) after which rebalancing
+ * should be started automatically. Rebalancing should be delayed if you plan to restart nodes
* after they leave topology, or if you plan to start multiple nodes at once or one after another
- * and don't want to repartition and preload until all nodes are started.
+ * and don't want to repartition and rebalance until all nodes are started.
* <p>
- * Delayed preloading is applied to {@link CacheMode#PARTITIONED} caches only.
+ * Delayed rebalancing is applied to {@link CacheMode#PARTITIONED} caches only.
* For better efficiency user should usually make sure that new nodes get placed on
* the same place of consistent hash ring as the left nodes, and that nodes are
* restarted before this delay expires. To place nodes on the same place in consistent hash ring,
@@ -1347,59 +1347,59 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
* to make sure that a node maps to the same hash ID event if restarted. As an example,
* node IP address and port combination may be used in this case.
* <p>
- * Default value is {@code 0} which means that repartitioning and preloading will start
- * immediately upon node leaving topology. If {@code -1} is returned, then preloading
+ * Default value is {@code 0} which means that repartitioning and rebalancing will start
+ * immediately upon node leaving topology. If {@code -1} is returned, then rebalancing
* will only be started manually by calling {@link GridCache#forceRepartition()} method or
* from management console.
*
- * @return Preloading delay, {@code 0} to start preloading immediately, {@code -1} to
- * start preloading manually, or positive value to specify delay in milliseconds
- * after which preloading should start automatically.
+ * @return Rebalancing delay, {@code 0} to start rebalancing immediately, {@code -1} to
+ * start rebalancing manually, or positive value to specify delay in milliseconds
+ * after which rebalancing should start automatically.
*/
- public long getPreloadPartitionedDelay() {
- return preloadDelay;
+ public long getRebalancePartitionedDelay() {
+ return rebalanceDelay;
}
/**
- * Sets preload delay (see {@link #getPreloadPartitionedDelay()} for more information).
+ * Sets rebalance delay (see {@link #getRebalancePartitionedDelay()} for more information).
*
- * @param preloadDelay Preload delay to set.
+ * @param rebalanceDelay Rebalance delay to set.
*/
- public void setPreloadPartitionedDelay(long preloadDelay) {
- this.preloadDelay = preloadDelay;
+ public void setRebalancePartitionedDelay(long rebalanceDelay) {
+ this.rebalanceDelay = rebalanceDelay;
}
/**
- * Time in milliseconds to wait between preload messages to avoid overloading of CPU or network.
- * When preloading large data sets, the CPU or network can get over-consumed with preloading messages,
+ * Time in milliseconds to wait between rebalance messages to avoid overloading of CPU or network.
+ * When rebalancing large data sets, the CPU or network can get over-consumed with rebalancing messages,
* which consecutively may slow down the application performance. This parameter helps tune
- * the amount of time to wait between preload messages to make sure that preloading process
+ * the amount of time to wait between rebalance messages to make sure that rebalancing process
* does not have any negative performance impact. Note that application will continue to work
- * properly while preloading is still in progress.
+ * properly while rebalancing is still in progress.
* <p>
* Value of {@code 0} means that throttling is disabled. By default throttling is disabled -
- * the default is defined by {@link #DFLT_PRELOAD_THROTTLE} constant.
+ * the default is defined by {@link #DFLT_REBALANCE_THROTTLE} constant.
*
- * @return Time in milliseconds to wait between preload messages to avoid overloading of CPU,
+ * @return Time in milliseconds to wait between rebalance messages to avoid overloading of CPU,
* {@code 0} to disable throttling.
*/
- public long getPreloadThrottle() {
- return preloadThrottle;
+ public long getRebalanceThrottle() {
+ return rebalanceThrottle;
}
/**
- * Time in milliseconds to wait between preload messages to avoid overloading of CPU or network. When preloading
- * large data sets, the CPU or network can get over-consumed with preloading messages, which consecutively may slow
- * down the application performance. This parameter helps tune the amount of time to wait between preload messages
- * to make sure that preloading process does not have any negative performance impact. Note that application will
- * continue to work properly while preloading is still in progress. <p> Value of {@code 0} means that throttling is
- * disabled. By default throttling is disabled - the default is defined by {@link #DFLT_PRELOAD_THROTTLE} constant.
+ * Time in milliseconds to wait between rebalance messages to avoid overloading of CPU or network. When rebalancing
+ * large data sets, the CPU or network can get over-consumed with rebalancing messages, which consecutively may slow
+ * down the application performance. This parameter helps tune the amount of time to wait between rebalance messages
+ * to make sure that rebalancing process does not have any negative performance impact. Note that application will
+ * continue to work properly while rebalancing is still in progress. <p> Value of {@code 0} means that throttling is
+ * disabled. By default throttling is disabled - the default is defined by {@link #DFLT_REBALANCE_THROTTLE} constant.
*
- * @param preloadThrottle Time in milliseconds to wait between preload messages to avoid overloading of CPU, {@code
- * 0} to disable throttling.
+ * @param rebalanceThrottle Time in milliseconds to wait between rebalance messages to avoid overloading of CPU,
+ * {@code 0} to disable throttling.
*/
- public void setPreloadThrottle(long preloadThrottle) {
- this.preloadThrottle = preloadThrottle;
+ public void setRebalanceThrottle(long rebalanceThrottle) {
+ this.rebalanceThrottle = rebalanceThrottle;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java
deleted file mode 100644
index 25ec68a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java
+++ /dev/null
@@ -1,172 +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.events;
-
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-/**
- * In-memory database (cache) preloading event. Preload event happens every time there is a change
- * in grid topology, which means that a node has either joined or left the grid.
- * <p>
- * Grid events are used for notification about what happens within the grid. Note that by
- * design Ignite keeps all events generated on the local node locally and it provides
- * APIs for performing a distributed queries across multiple nodes:
- * <ul>
- * <li>
- * {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} -
- * asynchronously querying events occurred on the nodes specified, including remote nodes.
- * </li>
- * <li>
- * {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} -
- * querying only local events stored on this local node.
- * </li>
- * <li>
- * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} -
- * listening to local grid events (events from remote nodes not included).
- * </li>
- * </ul>
- * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}.
- * <h1 class="header">Events and Performance</h1>
- * Note that by default all events in Ignite are enabled and therefore generated and stored
- * by whatever event storage SPI is configured. Ignite can and often does generate thousands events per seconds
- * under the load and therefore it creates a significant additional load on the system. If these events are
- * not needed by the application this load is unnecessary and leads to significant performance degradation.
- * <p>
- * It is <b>highly recommended</b> to enable only those events that your application logic requires
- * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
- * events are required for Ignite's internal operations and such events will still be generated but not stored by
- * event storage SPI if they are disabled in Ignite configuration.
- * @see EventType#EVT_CACHE_PRELOAD_PART_LOADED
- * @see EventType#EVT_CACHE_PRELOAD_PART_UNLOADED
- * @see EventType#EVT_CACHE_PRELOAD_STARTED
- * @see EventType#EVT_CACHE_PRELOAD_STOPPED
- */
-public class CachePreloadingEvent extends EventAdapter {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Cache name. */
- private String cacheName;
-
- /** Partition for the event. */
- private int part;
-
- /** Discovery node. */
- private ClusterNode discoNode;
-
- /** Discovery event type. */
- private int discoEvtType;
-
- /** Discovery event time. */
- private long discoTs;
-
- /**
- * Constructs cache event.
- *
- * @param cacheName Cache name.
- * @param node Event node.
- * @param msg Event message.
- * @param type Event type.
- * @param part Partition for the event (usually the partition the key belongs to).
- * @param discoNode Node that triggered this preloading event.
- * @param discoEvtType Discovery event type that triggered this preloading event.
- * @param discoTs Timestamp of discovery event that triggered this preloading event.
- */
- public CachePreloadingEvent(String cacheName, ClusterNode node, String msg, int type, int part,
- ClusterNode discoNode, int discoEvtType, long discoTs) {
- super(node, msg, type);
- this.cacheName = cacheName;
- this.part = part;
- this.discoNode = discoNode;
- this.discoEvtType = discoEvtType;
- this.discoTs = discoTs;
- }
-
- /**
- * Gets cache name.
- *
- * @return Cache name.
- */
- public String cacheName() {
- return cacheName;
- }
-
- /**
- * Gets partition for the event.
- *
- * @return Partition for the event.
- */
- public int partition() {
- return part;
- }
-
- /**
- * Gets shadow of the node that triggered this preloading event.
- *
- * @return Shadow of the node that triggered this preloading event.
- */
- public ClusterNode discoveryNode() {
- return discoNode;
- }
-
- /**
- * Gets type of discovery event that triggered this preloading event.
- *
- * @return Type of discovery event that triggered this preloading event.
- * @see DiscoveryEvent#type()
- */
- public int discoveryEventType() {
- return discoEvtType;
- }
-
- /**
- * Gets name of discovery event that triggered this preloading event.
- *
- * @return Name of discovery event that triggered this preloading event.
- * @see DiscoveryEvent#name()
- */
- public String discoveryEventName() {
- return U.gridEventName(discoEvtType);
- }
-
- /**
- * Gets timestamp of discovery event that caused this preloading event.
- *
- * @return Timestamp of discovery event that caused this preloading event.
- */
- public long discoveryTimestamp() {
- return discoTs;
- }
-
- /** {@inheritDoc} */
- @Override public String shortDisplay() {
- return name() + ": cache=" + CU.mask(cacheName) + ", cause=" +
- discoveryEventName();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(CachePreloadingEvent.class, this,
- "discoEvtName", discoveryEventName(),
- "nodeId8", U.id8(node().id()),
- "msg", message(),
- "type", name(),
- "tstamp", timestamp());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
new file mode 100644
index 0000000..661c2b5
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java
@@ -0,0 +1,172 @@
+/*
+ * 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.events;
+
+import org.apache.ignite.cluster.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+/**
+ * In-memory database (cache) rebalancing event. Rebalance event happens every time there is a change
+ * in grid topology, which means that a node has either joined or left the grid.
+ * <p>
+ * Grid events are used for notification about what happens within the grid. Note that by
+ * design Ignite keeps all events generated on the local node locally and it provides
+ * APIs for performing a distributed queries across multiple nodes:
+ * <ul>
+ * <li>
+ * {@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)} -
+ * asynchronously querying events occurred on the nodes specified, including remote nodes.
+ * </li>
+ * <li>
+ * {@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ * querying only local events stored on this local node.
+ * </li>
+ * <li>
+ * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} -
+ * listening to local grid events (events from remote nodes not included).
+ * </li>
+ * </ul>
+ * User can also wait for events using method {@link org.apache.ignite.IgniteEvents#waitForLocal(org.apache.ignite.lang.IgnitePredicate, int...)}.
+ * <h1 class="header">Events and Performance</h1>
+ * Note that by default all events in Ignite are enabled and therefore generated and stored
+ * by whatever event storage SPI is configured. Ignite can and often does generate thousands events per seconds
+ * under the load and therefore it creates a significant additional load on the system. If these events are
+ * not needed by the application this load is unnecessary and leads to significant performance degradation.
+ * <p>
+ * It is <b>highly recommended</b> to enable only those events that your application logic requires
+ * by using {@link org.apache.ignite.configuration.IgniteConfiguration#getIncludeEventTypes()} method in Ignite configuration. Note that certain
+ * events are required for Ignite's internal operations and such events will still be generated but not stored by
+ * event storage SPI if they are disabled in Ignite configuration.
+ * @see EventType#EVT_CACHE_REBALANCE_PART_LOADED
+ * @see EventType#EVT_CACHE_REBALANCE_PART_UNLOADED
+ * @see EventType#EVT_CACHE_REBALANCE_STARTED
+ * @see EventType#EVT_CACHE_REBALANCE_STOPPED
+ */
+public class CacheRebalancingEvent extends EventAdapter {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Cache name. */
+ private String cacheName;
+
+ /** Partition for the event. */
+ private int part;
+
+ /** Discovery node. */
+ private ClusterNode discoNode;
+
+ /** Discovery event type. */
+ private int discoEvtType;
+
+ /** Discovery event time. */
+ private long discoTs;
+
+ /**
+ * Constructs cache event.
+ *
+ * @param cacheName Cache name.
+ * @param node Event node.
+ * @param msg Event message.
+ * @param type Event type.
+ * @param part Partition for the event (usually the partition the key belongs to).
+ * @param discoNode Node that triggered this rebalancing event.
+ * @param discoEvtType Discovery event type that triggered this rebalancing event.
+ * @param discoTs Timestamp of discovery event that triggered this rebalancing event.
+ */
+ public CacheRebalancingEvent(String cacheName, ClusterNode node, String msg, int type, int part,
+ ClusterNode discoNode, int discoEvtType, long discoTs) {
+ super(node, msg, type);
+ this.cacheName = cacheName;
+ this.part = part;
+ this.discoNode = discoNode;
+ this.discoEvtType = discoEvtType;
+ this.discoTs = discoTs;
+ }
+
+ /**
+ * Gets cache name.
+ *
+ * @return Cache name.
+ */
+ public String cacheName() {
+ return cacheName;
+ }
+
+ /**
+ * Gets partition for the event.
+ *
+ * @return Partition for the event.
+ */
+ public int partition() {
+ return part;
+ }
+
+ /**
+ * Gets shadow of the node that triggered this rebalancing event.
+ *
+ * @return Shadow of the node that triggered this rebalancing event.
+ */
+ public ClusterNode discoveryNode() {
+ return discoNode;
+ }
+
+ /**
+ * Gets type of discovery event that triggered this rebalancing event.
+ *
+ * @return Type of discovery event that triggered this rebalancing event.
+ * @see DiscoveryEvent#type()
+ */
+ public int discoveryEventType() {
+ return discoEvtType;
+ }
+
+ /**
+ * Gets name of discovery event that triggered this rebalancing event.
+ *
+ * @return Name of discovery event that triggered this rebalancing event.
+ * @see DiscoveryEvent#name()
+ */
+ public String discoveryEventName() {
+ return U.gridEventName(discoEvtType);
+ }
+
+ /**
+ * Gets timestamp of discovery event that caused this rebalancing event.
+ *
+ * @return Timestamp of discovery event that caused this rebalancing event.
+ */
+ public long discoveryTimestamp() {
+ return discoTs;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String shortDisplay() {
+ return name() + ": cache=" + CU.mask(cacheName) + ", cause=" +
+ discoveryEventName();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(CacheRebalancingEvent.class, this,
+ "discoEvtName", discoveryEventName(),
+ "nodeId8", U.id8(node().id()),
+ "msg", message(),
+ "type", name(),
+ "tstamp", timestamp());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/events/Event.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/Event.java b/modules/core/src/main/java/org/apache/ignite/events/Event.java
index b47bd54..3951677 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/Event.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/Event.java
@@ -75,7 +75,7 @@ import java.io.*;
* </ul>
* @see JobEvent
* @see CacheEvent
- * @see CachePreloadingEvent
+ * @see CacheRebalancingEvent
* @see SwapSpaceEvent
* @see CheckpointEvent
* @see DeploymentEvent
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/events/EventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index 5821da5..2ce47eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -17,10 +17,8 @@
package org.apache.ignite.events;
-import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import java.io.*;
import java.util.*;
/**
@@ -39,7 +37,7 @@ import java.util.*;
* <li>{@link #EVTS_JOB_EXECUTION}</li>
* <li>{@link #EVTS_TASK_EXECUTION}</li>
* <li>{@link #EVTS_CACHE}</li>
- * <li>{@link #EVTS_CACHE_PRELOAD}</li>
+ * <li>{@link #EVTS_CACHE_REBALANCE}</li>
* <li>{@link #EVTS_CACHE_QUERY}</li>
* <li>{@link #EVTS_SWAPSPACE}</li>
* </ul>
@@ -556,24 +554,24 @@ public interface EventType {
public static final int EVT_CACHE_OBJECT_FROM_OFFHEAP = 77;
/**
- * Built-in event type: cache preload started.
+ * Built-in event type: cache rebalance started.
* <p>
* NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
* internal Ignite events and should not be used by user-defined events.
*
* @see SwapSpaceEvent
*/
- public static final int EVT_CACHE_PRELOAD_STARTED = 80;
+ public static final int EVT_CACHE_REBALANCE_STARTED = 80;
/**
- * Built-in event type: cache preload stopped.
+ * Built-in event type: cache rebalance stopped.
* <p>
* NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
* internal Ignite events and should not be used by user-defined events.
*
* @see SwapSpaceEvent
*/
- public static final int EVT_CACHE_PRELOAD_STOPPED = 81;
+ public static final int EVT_CACHE_REBALANCE_STOPPED = 81;
/**
* Built-in event type: cache partition loaded.
@@ -583,7 +581,7 @@ public interface EventType {
*
* @see SwapSpaceEvent
*/
- public static final int EVT_CACHE_PRELOAD_PART_LOADED = 82;
+ public static final int EVT_CACHE_REBALANCE_PART_LOADED = 82;
/**
* Built-in event type: cache partition unloaded.
@@ -591,15 +589,15 @@ public interface EventType {
* NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
* internal Ignite events and should not be used by user-defined events.
*/
- public static final int EVT_CACHE_PRELOAD_PART_UNLOADED = 83;
+ public static final int EVT_CACHE_REBALANCE_PART_UNLOADED = 83;
/**
- * Built-in event type: cache entry preloaded.
+ * Built-in event type: cache entry rebalanced.
* <p>
* NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
* internal Ignite events and should not be used by user-defined events.
*/
- public static final int EVT_CACHE_PRELOAD_OBJECT_LOADED = 84;
+ public static final int EVT_CACHE_REBALANCE_OBJECT_LOADED = 84;
/**
* Built-in event type: cache entry unloaded.
@@ -607,7 +605,7 @@ public interface EventType {
* NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
* internal Ignite events and should not be used by user-defined events.
*/
- public static final int EVT_CACHE_PRELOAD_OBJECT_UNLOADED = 85;
+ public static final int EVT_CACHE_REBALANCE_OBJECT_UNLOADED = 85;
/**
* Built-in event type: query executed.
@@ -822,8 +820,8 @@ public interface EventType {
EVT_TASK_DEPLOY_FAILED,
EVT_TASK_DEPLOYED,
EVT_TASK_UNDEPLOYED,
- EVT_CACHE_PRELOAD_STARTED,
- EVT_CACHE_PRELOAD_STOPPED
+ EVT_CACHE_REBALANCE_STARTED,
+ EVT_CACHE_REBALANCE_STOPPED
};
/**
@@ -919,17 +917,17 @@ public interface EventType {
};
/**
- * All cache preload events. This array can be directly passed into
+ * All cache rebalance events. This array can be directly passed into
* {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} method to
- * subscribe to all cache preload events.
- */
- public static final int[] EVTS_CACHE_PRELOAD = {
- EVT_CACHE_PRELOAD_STARTED,
- EVT_CACHE_PRELOAD_STOPPED,
- EVT_CACHE_PRELOAD_PART_LOADED,
- EVT_CACHE_PRELOAD_PART_UNLOADED,
- EVT_CACHE_PRELOAD_OBJECT_LOADED,
- EVT_CACHE_PRELOAD_OBJECT_UNLOADED
+ * subscribe to all cache rebalance events.
+ */
+ public static final int[] EVTS_CACHE_REBALANCE = {
+ EVT_CACHE_REBALANCE_STARTED,
+ EVT_CACHE_REBALANCE_STOPPED,
+ EVT_CACHE_REBALANCE_PART_LOADED,
+ EVT_CACHE_REBALANCE_PART_UNLOADED,
+ EVT_CACHE_REBALANCE_OBJECT_LOADED,
+ EVT_CACHE_REBALANCE_OBJECT_UNLOADED
};
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 6503ed9..19cfc39 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -77,7 +77,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.IgniteConfiguration.*;
import static org.apache.ignite.internal.IgniteComponentType.*;
@@ -1933,7 +1933,7 @@ public class IgnitionEx {
cache.setAtomicityMode(TRANSACTIONAL);
cache.setSwapEnabled(false);
cache.setQueryIndexEnabled(false);
- cache.setPreloadMode(SYNC);
+ cache.setRebalanceMode(SYNC);
cache.setWriteSynchronizationMode(FULL_SYNC);
cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100));
@@ -1957,7 +1957,7 @@ public class IgnitionEx {
ccfg.setAtomicityMode(TRANSACTIONAL);
ccfg.setSwapEnabled(false);
ccfg.setQueryIndexEnabled(false);
- ccfg.setPreloadMode(SYNC);
+ ccfg.setRebalanceMode(SYNC);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setCacheMode(cfg.getCacheMode());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 a4762ab..00679c0 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
@@ -70,14 +70,14 @@ public class GridCacheAttributes implements Externalizable {
/** Flag indicating if cached values should be additionally stored in serialized form. */
private boolean storeValBytes;
- /** Cache preload mode. */
- private CachePreloadMode preloadMode;
+ /** Cache rebalance mode. */
+ private CacheRebalanceMode rebalanceMode;
/** Partitioned cache mode. */
private CacheDistributionMode partDistro;
- /** Preload batch size. */
- private int preloadBatchSize;
+ /** Rebalance batch size. */
+ private int rebalanceBatchSize;
/** Synchronization mode. */
private CacheWriteSynchronizationMode writeSyncMode;
@@ -170,8 +170,8 @@ public class GridCacheAttributes implements Externalizable {
loadPrevVal = cfg.isLoadPreviousValue();
name = cfg.getName();
partDistro = GridCacheUtils.distributionMode(cfg);
- preloadBatchSize = cfg.getPreloadBatchSize();
- preloadMode = cfg.getPreloadMode();
+ rebalanceBatchSize = cfg.getRebalanceBatchSize();
+ rebalanceMode = cfg.getRebalanceMode();
qryIdxEnabled = cfg.isQueryIndexEnabled();
readThrough = cfg.isReadThrough();
storeValBytes = cfg.isStoreValueBytes();
@@ -261,10 +261,10 @@ public class GridCacheAttributes implements Externalizable {
}
/**
- * @return Preload mode.
+ * @return Rebalance mode.
*/
- public CachePreloadMode cachePreloadMode() {
- return preloadMode;
+ public CacheRebalanceMode cacheRebalanceMode() {
+ return rebalanceMode;
}
/**
@@ -423,10 +423,10 @@ public class GridCacheAttributes implements Externalizable {
}
/**
- * @return Preload batch size.
+ * @return Rebalance batch size.
*/
- public int preloadBatchSize() {
- return preloadBatchSize;
+ public int rebalanceBatchSize() {
+ return rebalanceBatchSize;
}
/**
@@ -519,8 +519,8 @@ public class GridCacheAttributes implements Externalizable {
out.writeBoolean(loadPrevVal);
U.writeString(out, name);
U.writeEnum(out, partDistro);
- out.writeInt(preloadBatchSize);
- U.writeEnum(out, preloadMode);
+ out.writeInt(rebalanceBatchSize);
+ U.writeEnum(out, rebalanceMode);
out.writeBoolean(qryIdxEnabled);
out.writeBoolean(readThrough);
out.writeBoolean(storeValBytes);
@@ -563,8 +563,8 @@ public class GridCacheAttributes implements Externalizable {
loadPrevVal = in.readBoolean();
name = U.readString(in);
partDistro = CacheDistributionMode.fromOrdinal(in.readByte());
- preloadBatchSize = in.readInt();
- preloadMode = CachePreloadMode.fromOrdinal(in.readByte());
+ rebalanceBatchSize = in.readInt();
+ rebalanceMode = CacheRebalanceMode.fromOrdinal(in.readByte());
qryIdxEnabled = in.readBoolean();
readThrough = in.readBoolean();
storeValBytes = in.readBoolean();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 3ec013c..22c7fe4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -63,7 +63,7 @@ import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMemoryMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
import static org.apache.ignite.internal.processors.cache.CacheFlag.*;
@@ -635,10 +635,10 @@ public class GridCacheContext<K, V> implements Externalizable {
}
/**
- * @return {@code True} if preload is enabled.
+ * @return {@code True} if rebalance is enabled.
*/
- public boolean preloadEnabled() {
- return cacheCfg.getPreloadMode() != NONE;
+ public boolean rebalanceEnabled() {
+ return cacheCfg.getRebalanceMode() != NONE;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index e1ff9c0..781005a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -219,8 +219,8 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
if (!cctx.events().isRecordable(type))
LT.warn(log, null, "Added event without checking if event is recordable: " + U.gridEventName(type));
- cctx.gridEvents().record(new CachePreloadingEvent(cctx.name(), cctx.localNode(),
- "Cache preloading event.", type, part, discoNode, discoType, discoTs));
+ cctx.gridEvents().record(new CacheRebalancingEvent(cctx.name(), cctx.localNode(),
+ "Cache rebalancing event.", type, part, discoNode, discoType, discoTs));
}
/**
@@ -229,12 +229,12 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param part Partition.
*/
public void addUnloadEvent(int part) {
- if (!cctx.events().isRecordable(EVT_CACHE_PRELOAD_PART_UNLOADED))
+ if (!cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_UNLOADED))
LT.warn(log, null, "Added event without checking if event is recordable: " +
- U.gridEventName(EVT_CACHE_PRELOAD_PART_UNLOADED));
+ U.gridEventName(EVT_CACHE_REBALANCE_PART_UNLOADED));
- cctx.gridEvents().record(new CachePreloadingEvent(cctx.name(), cctx.localNode(),
- "Cache unloading event.", EVT_CACHE_PRELOAD_PART_UNLOADED, part, null, 0, 0));
+ cctx.gridEvents().record(new CacheRebalancingEvent(cctx.name(), cctx.localNode(),
+ "Cache unloading event.", EVT_CACHE_REBALANCE_PART_UNLOADED, part, null, 0, 0));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 382eb61..a7f9310 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
@@ -494,7 +494,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
* @param p Partition ID.
*/
private void saveEvictionInfo(K key, GridCacheVersion ver, int p) {
- assert cctx.preloadEnabled();
+ assert cctx.rebalanceEnabled();
if (!cctx.isNear()) {
try {
@@ -520,7 +520,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
* {@code false} if preloading is finished or disabled and no lock is needed.
*/
private boolean lockPartition(int p) {
- if (!cctx.preloadEnabled())
+ if (!cctx.rebalanceEnabled())
return false;
if (!cctx.isNear()) {
@@ -556,7 +556,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
* @param p Partition ID.
*/
private void unlockPartition(int p) {
- if (!cctx.preloadEnabled())
+ if (!cctx.rebalanceEnabled())
return;
if (!cctx.isNear()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index d7b1914..482b5a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -824,11 +824,11 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
changed |= cacheCtx.topology().afterExchange(exchFut.exchangeId());
// Preload event notification.
- if (cacheCtx.events().isRecordable(EVT_CACHE_PRELOAD_STARTED)) {
+ if (cacheCtx.events().isRecordable(EVT_CACHE_REBALANCE_STARTED)) {
if (!cacheCtx.isReplicated() || !startEvtFired) {
DiscoveryEvent discoEvt = exchFut.discoveryEvent();
- cacheCtx.events().addPreloadEvent(-1, EVT_CACHE_PRELOAD_STARTED,
+ cacheCtx.events().addPreloadEvent(-1, EVT_CACHE_REBALANCE_STARTED,
discoEvt.eventNode(), discoEvt.type(), discoEvt.timestamp());
}
}
@@ -851,7 +851,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
for (GridCacheContext<K, V> cacheCtx : cctx.cacheContexts()) {
- long delay = cacheCtx.config().getPreloadPartitionedDelay();
+ long delay = cacheCtx.config().getRebalancePartitionedDelay();
GridDhtPreloaderAssignments<K, V> assigns = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/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 e99c706..c427053 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
@@ -60,7 +60,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
@@ -90,8 +90,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** Map of preload finish futures grouped by preload order. */
private final NavigableMap<Integer, IgniteInternalFuture<?>> preloadFuts;
- /** Maximum detected preload order. */
- private int maxPreloadOrder;
+ /** Maximum detected rebalance order. */
+ private int maxRebalanceOrder;
/** System cache names. */
private final Set<String> sysCaches;
@@ -169,8 +169,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ctx.igfsHelper().preProcessCacheConfiguration(cfg);
- if (cfg.getPreloadMode() == null)
- cfg.setPreloadMode(ASYNC);
+ if (cfg.getRebalanceMode() == null)
+ cfg.setRebalanceMode(ASYNC);
if (cfg.getAtomicityMode() == null)
cfg.setAtomicityMode(ATOMIC);
@@ -333,9 +333,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
U.warn(log, "CacheAffinityFunction configuration parameter will be ignored for local cache [cacheName=" +
cc.getName() + ']');
- if (cc.getPreloadMode() != CachePreloadMode.NONE) {
- assertParameter(cc.getPreloadThreadPoolSize() > 0, "preloadThreadPoolSize > 0");
- assertParameter(cc.getPreloadBatchSize() > 0, "preloadBatchSize > 0");
+ if (cc.getRebalanceMode() != CacheRebalanceMode.NONE) {
+ assertParameter(cc.getRebalanceThreadPoolSize() > 0, "rebalanceThreadPoolSize > 0");
+ assertParameter(cc.getRebalanceBatchSize() > 0, "rebalanceBatchSize > 0");
}
if (cc.getCacheMode() == PARTITIONED || cc.getCacheMode() == REPLICATED) {
@@ -384,23 +384,23 @@ public class GridCacheProcessor extends GridProcessorAdapter {
throw new IgniteCheckedException("Cannot enable write-through (writer or store is not provided) " +
"for cache: " + cc.getName());
- long delay = cc.getPreloadPartitionedDelay();
+ long delay = cc.getRebalancePartitionedDelay();
if (delay != 0) {
if (cc.getCacheMode() != PARTITIONED)
- U.warn(log, "Preload delay is supported only for partitioned caches (will ignore): " + cc.getName(),
- "Will ignore preload delay for cache: " + cc.getName());
- else if (cc.getPreloadMode() == SYNC) {
+ U.warn(log, "Rebalance delay is supported only for partitioned caches (will ignore): " + cc.getName(),
+ "Will ignore rebalance delay for cache: " + cc.getName());
+ else if (cc.getRebalanceMode() == SYNC) {
if (delay < 0) {
- U.warn(log, "Ignoring SYNC preload mode with manual preload start (node will not wait for " +
- "preloading to be finished): " + cc.getName(),
- "Node will not wait for preload in SYNC mode: " + cc.getName());
+ U.warn(log, "Ignoring SYNC rebalance mode with manual rebalance start (node will not wait for " +
+ "rebalancing to be finished): " + cc.getName(),
+ "Node will not wait for rebalance in SYNC mode: " + cc.getName());
}
else {
U.warn(log,
- "Using SYNC preload mode with preload delay (node will wait until preloading is " +
+ "Using SYNC rebalance mode with rebalance delay (node will wait until rebalancing is " +
"initiated for " + delay + "ms) for cache: " + cc.getName(),
- "Node will wait until preloading is initiated for " + delay + "ms for cache: " + cc.getName());
+ "Node will wait until rebalancing is initiated for " + delay + "ms for cache: " + cc.getName());
}
}
}
@@ -556,7 +556,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
"Deployment mode for cache is not CONTINUOUS or SHARED.");
}
- maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration());
+ maxRebalanceOrder = validatePreloadOrder(ctx.config().getCacheConfiguration());
// Internal caches which should not be returned to user.
IgfsConfiguration[] igfsCfgs = ctx.grid().configuration().getIgfsConfiguration();
@@ -967,23 +967,23 @@ public class GridCacheProcessor extends GridProcessorAdapter {
int maxOrder = 0;
for (CacheConfiguration cfg : cfgs) {
- int preloadOrder = cfg.getPreloadOrder();
+ int rebalanceOrder = cfg.getRebalanceOrder();
- if (preloadOrder > 0) {
+ if (rebalanceOrder > 0) {
if (cfg.getCacheMode() == LOCAL)
- throw new IgniteCheckedException("Preload order set for local cache (fix configuration and restart the " +
+ throw new IgniteCheckedException("Rebalance order set for local cache (fix configuration and restart the " +
"node): " + cfg.getName());
- if (cfg.getPreloadMode() == CachePreloadMode.NONE)
- throw new IgniteCheckedException("Only caches with SYNC or ASYNC preload mode can be set as preload " +
+ if (cfg.getRebalanceMode() == CacheRebalanceMode.NONE)
+ throw new IgniteCheckedException("Only caches with SYNC or ASYNC rebalance mode can be set as rebalance " +
"dependency for other caches [cacheName=" + cfg.getName() +
- ", preloadMode=" + cfg.getPreloadMode() + ", preloadOrder=" + cfg.getPreloadOrder() + ']');
+ ", rebalanceMode=" + cfg.getRebalanceMode() + ", rebalanceOrder=" + cfg.getRebalanceOrder() + ']');
- maxOrder = Math.max(maxOrder, preloadOrder);
+ maxOrder = Math.max(maxOrder, rebalanceOrder);
}
- else if (preloadOrder < 0)
- throw new IgniteCheckedException("Preload order cannot be negative for cache (fix configuration and restart " +
- "the node) [cacheName=" + cfg.getName() + ", preloadOrder=" + preloadOrder + ']');
+ else if (rebalanceOrder < 0)
+ throw new IgniteCheckedException("Rebalance order cannot be negative for cache (fix configuration and restart " +
+ "the node) [cacheName=" + cfg.getName() + ", rebalanceOrder=" + rebalanceOrder + ']');
}
return maxOrder;
@@ -1080,8 +1080,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "atomicityMode",
"Cache atomicity mode", locAttr.atomicityMode(), rmtAttr.atomicityMode(), true);
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cachePreloadMode",
- "Cache preload mode", locAttr.cachePreloadMode(), rmtAttr.cachePreloadMode(), true);
+ CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheRebalanceMode",
+ "Cache rebalance mode", locAttr.cacheRebalanceMode(), rmtAttr.cacheRebalanceMode(), true);
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity", "Cache affinity",
locAttr.cacheAffinityClassName(), rmtAttr.cacheAffinityClassName(), true);
@@ -1129,8 +1129,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "defaultTimeToLive",
"Default time to live", locAttr.defaultTimeToLive(), rmtAttr.defaultTimeToLive(), false);
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "preloadBatchSize",
- "Preload batch size", locAttr.preloadBatchSize(), rmtAttr.preloadBatchSize(), false);
+ CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "rebalanceBatchSize",
+ "Rebalance batch size", locAttr.rebalanceBatchSize(), rmtAttr.rebalanceBatchSize(), false);
CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "swapEnabled",
"Swap enabled", locAttr.swapEnabled(), rmtAttr.swapEnabled(), false);
@@ -1298,12 +1298,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
for (Map.Entry<String, GridCacheAdapter<?, ?>> e : caches.entrySet()) {
GridCacheAdapter cache = e.getValue();
- if (maxPreloadOrder > 0) {
+ if (maxRebalanceOrder > 0) {
CacheConfiguration cfg = cache.configuration();
- int order = cfg.getPreloadOrder();
+ int order = cfg.getRebalanceOrder();
- if (order > 0 && order != maxPreloadOrder && cfg.getCacheMode() != LOCAL) {
+ if (order > 0 && order != maxRebalanceOrder && cfg.getCacheMode() != LOCAL) {
GridCompoundFuture<Object, Object> fut = (GridCompoundFuture<Object, Object>)preloadFuts
.get(order);
@@ -1331,9 +1331,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
for (GridCacheAdapter<?, ?> cache : caches.values()) {
CacheConfiguration cfg = cache.configuration();
- if (cfg.getPreloadMode() == SYNC) {
+ if (cfg.getRebalanceMode() == SYNC) {
if (cfg.getCacheMode() == REPLICATED ||
- (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadPartitionedDelay() >= 0))
+ (cfg.getCacheMode() == PARTITIONED && cfg.getRebalancePartitionedDelay() >= 0))
cache.preloader().syncFuture().get();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc04e98c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
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 1e67907..004dda3 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
@@ -49,7 +49,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
import static org.apache.ignite.internal.GridTopic.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
@@ -1512,7 +1512,7 @@ public class GridCacheUtils {
cache.setQueryIndexEnabled(false);
cache.setCacheStoreFactory(null);
cache.setEagerTtl(true);
- cache.setPreloadMode(SYNC);
+ cache.setRebalanceMode(SYNC);
return cache;
}