Index: benchmarks/risk-analytics/config/worker.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/risk-analytics/config/worker.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/risk-analytics/config/worker.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -48,7 +48,7 @@ - + Index: benchmarks/yardstick/config/portable/cache-client.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/cache-client.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/cache-client.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -50,7 +50,7 @@ - + Index: benchmarks/yardstick/config/portable/cache-near.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/cache-near.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/cache-near.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -50,7 +50,7 @@ - + Index: benchmarks/yardstick/config/portable/cache-tx.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/cache-tx.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/cache-tx.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -61,7 +61,7 @@ - + Index: benchmarks/yardstick/config/portable/cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/cache.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/cache.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + Index: benchmarks/yardstick/config/portable/fosters-cache-client.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/fosters-cache-client.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/fosters-cache-client.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -47,7 +47,7 @@ - + Index: benchmarks/yardstick/config/portable/fosters-cache-near.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/fosters-cache-near.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/fosters-cache-near.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -47,7 +47,7 @@ - + Index: benchmarks/yardstick/config/portable/fosters-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/portable/fosters-cache.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/portable/fosters-cache.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -47,7 +47,7 @@ - + Index: benchmarks/yardstick/config/single-node.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- benchmarks/yardstick/config/single-node.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ benchmarks/yardstick/config/single-node.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + Index: examples/config/example-cache-client.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- examples/config/example-cache-client.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ examples/config/example-cache-client.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -91,7 +91,7 @@ - + Index: examples/config/example-cache-dotnet.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- examples/config/example-cache-dotnet.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ examples/config/example-cache-dotnet.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -76,7 +76,7 @@ - + Index: examples/config/example-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- examples/config/example-cache.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ examples/config/example-cache.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -248,8 +248,8 @@ - - + + Index: modules/clients/src/test/dotnet/gridgain-test/config/native-client-test-cache-portables.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/clients/src/test/dotnet/gridgain-test/config/native-client-test-cache-portables.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/clients/src/test/dotnet/gridgain-test/config/native-client-test-cache-portables.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -166,7 +166,7 @@ - + Index: modules/clients/src/test/dotnet/gridgain-test/config/native-client-test-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/clients/src/test/dotnet/gridgain-test/config/native-client-test-cache.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/clients/src/test/dotnet/gridgain-test/config/native-client-test-cache.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -195,7 +195,7 @@ - + Index: modules/clients/src/test/dotnet/gridgain-test/config/start-test-grid1.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/clients/src/test/dotnet/gridgain-test/config/start-test-grid1.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/clients/src/test/dotnet/gridgain-test/config/start-test-grid1.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -27,7 +27,7 @@ - + Index: modules/compatibility/config/visor-tester-base.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/compatibility/config/visor-tester-base.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/compatibility/config/visor-tester-base.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -314,8 +314,8 @@ --> - - + + - + - + - + @@ -444,7 +444,7 @@ - + @@ -469,7 +469,7 @@ - + Index: modules/compatibility/gg-versions/_7.0.0/src/main/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/compatibility/gg-versions/_7.0.0/src/main/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/compatibility/gg-versions/_7.0.0/src/main/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -33,7 +33,7 @@ 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.*; /** @@ -365,7 +365,7 @@ ccfg.setDistributionMode(PARTITIONED_ONLY); ccfg.setBackups(1); ccfg.setStartSize(3000000); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setQueryIndexEnabled(true); Index: modules/compatibility/src/test/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/compatibility/src/test/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/compatibility/src/test/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -35,7 +35,7 @@ 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 org.gridgain.grid.spi.indexing.h2.*; @@ -401,7 +401,7 @@ ccfg.setDistributionMode(PARTITIONED_ONLY); ccfg.setBackups(1); ccfg.setStartSize(3000000); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setQueryIndexEnabled(true); Index: modules/core/src/test/config/datastructures/fosters/node.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/config/datastructures/fosters/node.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/config/datastructures/fosters/node.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -27,7 +27,7 @@ - + Index: modules/core/src/test/config/datastructures/local/node.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/config/datastructures/local/node.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/config/datastructures/local/node.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -29,7 +29,7 @@ - + Index: modules/core/src/test/config/dr/fosters/common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/config/dr/fosters/common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/config/dr/fosters/common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -25,7 +25,7 @@ - + Index: modules/core/src/test/config/dr/local/common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/config/dr/local/common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/config/dr/local/common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -23,7 +23,7 @@ - + Index: modules/core/src/test/config/gg-replication-load-test-master.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/config/gg-replication-load-test-master.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/config/gg-replication-load-test-master.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -79,8 +79,8 @@ --> - - + + - + + - - + + - - + + - + - + Index: modules/core/src/test/java/org/gridgain/grid/internal/processors/cache/portable/GridCacheAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/grid/internal/processors/cache/portable/GridCacheAbstractSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/grid/internal/processors/cache/portable/GridCacheAbstractSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -34,7 +34,7 @@ import java.util.*; 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.*; /** @@ -57,7 +57,7 @@ cacheCfg.setAtomicityMode(atomicityMode()); cacheCfg.setDistributionMode(distributionMode()); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setSwapEnabled(true); cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); cacheCfg.setReadThrough(true); Index: modules/core/src/test/java/org/gridgain/internal/processors/cache/distributed/GridCachePortablePreloadIndexingSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/cache/distributed/GridCachePortablePreloadIndexingSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/cache/distributed/GridCachePortablePreloadIndexingSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -23,7 +23,7 @@ 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.*; /** * Tests that portable objects are correctly indexed during preloading. @@ -73,7 +73,7 @@ ccfg.setCacheMode(REPLICATED); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); if (offheapTiered()) { ccfg.setMemoryMode(OFFHEAP_TIERED); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/GridDrAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/GridDrAbstractTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/GridDrAbstractTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -47,7 +47,7 @@ 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.gridgain.grid.dr.cache.sender.GridDrSenderCacheMode.*; @@ -503,7 +503,7 @@ ggCacheConfig(ggCfg, ccfg).setDrSenderConfiguration(drSndCfg); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setSwapEnabled(true); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setEvictSynchronized(false); @@ -548,7 +548,7 @@ ggCacheConfig(ggCfg, ccfg).setDrSenderConfiguration(drSndCfg); } - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setSwapEnabled(true); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setEvictSynchronized(false); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/GridDrMultithreadedAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/GridDrMultithreadedAbstractTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/GridDrMultithreadedAbstractTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -32,7 +32,7 @@ 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.gridgain.grid.dr.cache.sender.GridDrSenderCacheMode.*; @@ -368,7 +368,7 @@ ccfg.setEvictionPolicy(null); if (cacheMode() == PARTITIONED) ccfg.setBackups(snd ? senderBackups() : receiverBackups()); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setWriteSynchronizationMode(FULL_SYNC); if (atomicityMode() == ATOMIC) { Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheFilterSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheFilterSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheFilterSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -36,7 +36,7 @@ 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.gridgain.grid.dr.cache.sender.GridDrSenderCacheMode.*; @@ -527,7 +527,7 @@ ccfg.setDistributionMode(PARTITIONED_ONLY); ccfg.setBackups(1); // Exactly one backup is required. ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestStore())); ccfg.setReadThrough(true); ccfg.setWriteThrough(true); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheLoadSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheLoadSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheLoadSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -31,7 +31,7 @@ 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.gridgain.grid.dr.cache.sender.GridDrSenderCacheMode.*; @@ -161,7 +161,7 @@ ccfg.setBackups(1); // Exactly one backup is required. ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); GridDrSenderCacheConfiguration drSndCfg = new GridDrSenderCacheConfiguration(); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataLoaderFailoverSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataLoaderFailoverSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataLoaderFailoverSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -37,7 +37,7 @@ 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.*; /** @@ -433,7 +433,7 @@ ccfg.setDistributionMode(PARTITIONED_ONLY); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setBackups(1); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ggCacheConfig(ggCfg, ccfg).setDrReceiverConfiguration(new GridDrReceiverCacheConfiguration()); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataLoaderPerformanceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataLoaderPerformanceTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataLoaderPerformanceTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -35,7 +35,7 @@ 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.*; /** @@ -240,7 +240,7 @@ ccfg.setDistributionMode(PARTITIONED_ONLY); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setBackups(1); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ggCacheConfig(ggCfg, ccfg).setDrReceiverConfiguration(new GridDrReceiverCacheConfiguration()); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/conflicts/GridDrCacheConflictsAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/conflicts/GridDrCacheConflictsAbstractSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/conflicts/GridDrCacheConflictsAbstractSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -35,7 +35,7 @@ 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.gridgain.grid.dr.cache.receiver.GridDrReceiverCacheConflictResolverMode.*; @@ -1631,7 +1631,7 @@ ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setBackups(1); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); GridDrReceiverCacheConfiguration rcvCfg = new GridDrReceiverCacheConfiguration(); Index: modules/core/src/test/java/org/gridgain/internal/processors/dr/handler/GridDrHandlerBackupQueueSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/core/src/test/java/org/gridgain/internal/processors/dr/handler/GridDrHandlerBackupQueueSelfTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/core/src/test/java/org/gridgain/internal/processors/dr/handler/GridDrHandlerBackupQueueSelfTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -30,7 +30,7 @@ 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.gridgain.grid.dr.cache.sender.GridDrSenderCacheMode.*; @@ -235,7 +235,7 @@ ccfg.setDistributionMode(PARTITIONED_ONLY); ccfg.setBackups(backups); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); GridDrSenderCacheConfiguration drSndCfg = new GridDrSenderCacheConfiguration(); Index: modules/dr-demo/config/boku/common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/dr-demo/config/boku/common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/dr-demo/config/boku/common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -23,7 +23,7 @@ - + Index: modules/dr-demo/config/distr/common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/dr-demo/config/distr/common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/dr-demo/config/distr/common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -23,7 +23,7 @@ - + Index: modules/dr-demo/config/fosters/common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/dr-demo/config/fosters/common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/dr-demo/config/fosters/common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -23,7 +23,7 @@ - + Index: modules/dr-demo/config/local/common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/dr-demo/config/local/common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/dr-demo/config/local/common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -23,7 +23,7 @@ - + Index: modules/mongo/config/default-config-mongo.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/mongo/config/default-config-mongo.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/mongo/config/default-config-mongo.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -97,9 +97,9 @@ - + - + - + Index: modules/mongo/config/default-mongo.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/mongo/config/default-mongo.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/mongo/config/default-mongo.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -80,7 +80,7 @@ - + - - + + - - + + Index: modules/visor-demo/config/visor-demo.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/visor-demo/config/visor-demo.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/visor-demo/config/visor-demo.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -152,8 +152,8 @@ --> - - + + - - + + Index: modules/visor/src/test/scala/config/security-base.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/visor/src/test/scala/config/security-base.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/visor/src/test/scala/config/security-base.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -66,8 +66,8 @@ - - + + Index: modules/visor/src/test/scala/config/visor-dr-common.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/visor/src/test/scala/config/visor-dr-common.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/visor/src/test/scala/config/visor-dr-common.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -24,7 +24,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -50,7 +50,7 @@ - + Index: modules/visor/src/test/scala/config/visor-security-test.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/visor/src/test/scala/config/visor-security-test.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/visor/src/test/scala/config/visor-security-test.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -159,8 +159,8 @@ --> - - + + @@ -185,8 +185,8 @@ - - + + Index: modules/visor/src/test/scala/config/visor-test.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- modules/visor/src/test/scala/config/visor-test.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ modules/visor/src/test/scala/config/visor-test.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -102,8 +102,8 @@ --> - - + + @@ -128,8 +128,8 @@ - - + + Index: pilots/dsi/config/dsi-spring-server.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/dsi/config/dsi-spring-server.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/dsi/config/dsi-spring-server.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -89,7 +89,7 @@ --> - + @@ -111,7 +111,7 @@ - + - - + + Index: pilots/sb/config/sb-worker1.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sb/config/sb-worker1.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sb/config/sb-worker1.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -41,7 +41,7 @@ - + Index: pilots/sb/config/sb-worker2.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sb/config/sb-worker2.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sb/config/sb-worker2.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -41,7 +41,7 @@ - + Index: pilots/sb/config/worker1.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sb/config/worker1.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sb/config/worker1.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -51,7 +51,7 @@ - + Index: pilots/sb/config/worker2.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sb/config/worker2.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sb/config/worker2.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -51,7 +51,7 @@ - + Index: pilots/sony/config/sony-spring-partitioned.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sony/config/sony-spring-partitioned.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sony/config/sony-spring-partitioned.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -61,7 +61,7 @@ - + Index: pilots/sony/config/sony-spring-replicated.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sony/config/sony-spring-replicated.xml (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sony/config/sony-spring-replicated.xml (revision 870ad9787130904c66c607064777ef303febbed0) @@ -56,7 +56,7 @@ - + Index: pilots/sony/tests/org/gridgain/sony/impl/SonyQueueAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sony/tests/org/gridgain/sony/impl/SonyQueueAbstractTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sony/tests/org/gridgain/sony/impl/SonyQueueAbstractTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -63,7 +63,7 @@ cacheCfg.setDefaultTxConcurrency(TransactionConcurrency.PESSIMISTIC); cacheCfg.setDefaultTxIsolation(TransactionIsolation.REPEATABLE_READ); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setPreloadMode(CachePreloadMode.SYNC); + cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC); cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(0)); cfg.setCacheConfiguration(cacheCfg); Index: pilots/sony/tests/org/gridgain/sony/impl/SonyQueueServiceImplTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- pilots/sony/tests/org/gridgain/sony/impl/SonyQueueServiceImplTest.java (revision a0715dca89d2276dc9e56572654814ff28d47294) +++ pilots/sony/tests/org/gridgain/sony/impl/SonyQueueServiceImplTest.java (revision 870ad9787130904c66c607064777ef303febbed0) @@ -60,7 +60,7 @@ cacheCfg.setDefaultTxConcurrency(TransactionConcurrency.PESSIMISTIC); cacheCfg.setDefaultTxIsolation(TransactionIsolation.REPEATABLE_READ); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setPreloadMode(CachePreloadMode.SYNC); + cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC); cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(0)); cfg.setCacheConfiguration(cacheCfg); Index: ../incubator-ignite/examples/config/example-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/examples/config/example-cache.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/examples/config/example-cache.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -140,8 +140,8 @@ - - + + Index: ../incubator-ignite/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -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 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 @@ cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); CacheQueryConfiguration qryCfg = new CacheQueryConfiguration(); Index: ../incubator-ignite/modules/clients/src/test/resources/spring-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/clients/src/test/resources/spring-cache.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/clients/src/test/resources/spring-cache.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -99,8 +99,8 @@ --> - - + + - - + + Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/cache/CachePreloadMode.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/cache/CachePreloadMode.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/cache/CacheRebalanceMode.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -20,40 +20,40 @@ 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. + * 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. *

* 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. *

- * 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 + * 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 CachePreloadMode { +public enum CacheRebalanceMode { /** - * Synchronous preload mode. Distributed caches will not start until all necessary data + * Synchronous rebalance 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 + * 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 preloading will take place which means that caches will be either loaded on + * 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 CachePreloadMode[] VALS = values(); + private static final CacheRebalanceMode[] VALS = values(); /** * Efficiently gets enumerated value from its ordinal. @@ -61,7 +61,7 @@ * @param ord Ordinal value. * @return Enumerated value or {@code null} if ordinal out of range. */ - @Nullable public static CachePreloadMode fromOrdinal(int ord) { + @Nullable public static CacheRebalanceMode fromOrdinal(int ord) { return ord >= 0 && ord < VALS.length ? VALS[ord] : null; } } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -19,11 +19,9 @@ 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 @@ /** * 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. *

* 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. *

- * 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. *

- * @return Future that will be completed when preloading is finished. + * @return Future that will be completed when rebalancing is finished. */ public IgniteInternalFuture forceRepartition(); } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -43,14 +43,14 @@ */ @SuppressWarnings("RedundantFieldInitialization") public class CacheConfiguration extends MutableConfiguration { - /** 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 0 which means that @@ -91,11 +91,11 @@ /** 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 @@ /** 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 @@ /** 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 @@ 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 @@ 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 @@ } /** - * 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. *

- * 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. *

- * 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. *

* 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. *

- * 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 @@ } /** - * 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). *

- * 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). *

- * 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. *

- * 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 @@ * 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. *

- * 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. *

* 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.

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.

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; } /** Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/CacheRebalancingEvent.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -21,7 +21,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; /** - * In-memory database (cache) preloading event. Preload event happens every time there is a change + * 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. *

* Grid events are used for notification about what happens within the grid. Note that by @@ -52,12 +52,12 @@ * 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 + * @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 CachePreloadingEvent extends EventAdapter { +public class CacheRebalancingEvent extends EventAdapter { /** */ private static final long serialVersionUID = 0L; @@ -84,11 +84,11 @@ * @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. + * @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 CachePreloadingEvent(String cacheName, ClusterNode node, String msg, int type, int part, + 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; @@ -117,18 +117,18 @@ } /** - * Gets shadow of the node that triggered this preloading event. + * Gets shadow of the node that triggered this rebalancing event. * - * @return Shadow of the node that triggered this preloading event. + * @return Shadow of the node that triggered this rebalancing event. */ public ClusterNode discoveryNode() { return discoNode; } /** - * Gets type of discovery event that triggered this preloading event. + * Gets type of discovery event that triggered this rebalancing event. * - * @return Type of discovery event that triggered this preloading event. + * @return Type of discovery event that triggered this rebalancing event. * @see DiscoveryEvent#type() */ public int discoveryEventType() { @@ -136,9 +136,9 @@ } /** - * Gets name of discovery event that triggered this preloading event. + * Gets name of discovery event that triggered this rebalancing event. * - * @return Name of discovery event that triggered this preloading event. + * @return Name of discovery event that triggered this rebalancing event. * @see DiscoveryEvent#name() */ public String discoveryEventName() { @@ -146,9 +146,9 @@ } /** - * Gets timestamp of discovery event that caused this preloading event. + * Gets timestamp of discovery event that caused this rebalancing event. * - * @return Timestamp of discovery event that caused this preloading event. + * @return Timestamp of discovery event that caused this rebalancing event. */ public long discoveryTimestamp() { return discoTs; @@ -162,7 +162,7 @@ /** {@inheritDoc} */ @Override public String toString() { - return S.toString(CachePreloadingEvent.class, this, + return S.toString(CacheRebalancingEvent.class, this, "discoEvtName", discoveryEventName(), "nodeId8", U.id8(node().id()), "msg", message(), Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/Event.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/Event.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/Event.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -75,7 +75,7 @@ * * @see JobEvent * @see CacheEvent - * @see CachePreloadingEvent + * @see CacheRebalancingEvent * @see SwapSpaceEvent * @see CheckpointEvent * @see DeploymentEvent Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/EventType.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/EventType.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/events/EventType.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -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 @@ *

  • {@link #EVTS_JOB_EXECUTION}
  • *
  • {@link #EVTS_TASK_EXECUTION}
  • *
  • {@link #EVTS_CACHE}
  • - *
  • {@link #EVTS_CACHE_PRELOAD}
  • + *
  • {@link #EVTS_CACHE_REBALANCE}
  • *
  • {@link #EVTS_CACHE_QUERY}
  • *
  • {@link #EVTS_SWAPSPACE}
  • * @@ -556,24 +554,24 @@ public static final int EVT_CACHE_OBJECT_FROM_OFFHEAP = 77; /** - * Built-in event type: cache preload started. + * Built-in event type: cache rebalance started. *

    * NOTE: all types in range from 1 to 1000 are reserved 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. *

    * NOTE: all types in range from 1 to 1000 are reserved 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 @@ * * @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 @@ * NOTE: all types in range from 1 to 1000 are reserved 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. *

    * NOTE: all types in range from 1 to 1000 are reserved 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 @@ * NOTE: all types in range from 1 to 1000 are reserved 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 @@ 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 @@ }; /** - * 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. + * subscribe to all cache rebalance 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 + 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 }; /** Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -77,7 +77,7 @@ 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 @@ 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 @@ ccfg.setAtomicityMode(TRANSACTIONAL); ccfg.setSwapEnabled(false); ccfg.setQueryIndexEnabled(false); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setCacheMode(cfg.getCacheMode()); Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -70,14 +70,14 @@ /** 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 @@ 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 @@ } /** - * @return Preload mode. + * @return Rebalance mode. */ - public CachePreloadMode cachePreloadMode() { - return preloadMode; + public CacheRebalanceMode cacheRebalanceMode() { + return rebalanceMode; } /** @@ -423,10 +423,10 @@ } /** - * @return Preload batch size. + * @return Rebalance batch size. */ - public int preloadBatchSize() { - return preloadBatchSize; + public int rebalanceBatchSize() { + return rebalanceBatchSize; } /** @@ -519,8 +519,8 @@ 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 @@ 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(); Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -63,7 +63,7 @@ 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 @@ } /** - * @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; } /** Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -219,8 +219,8 @@ 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 @@ * @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)); } /** Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -494,7 +494,7 @@ * @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 @@ * {@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 @@ * @param p Partition ID. */ private void unlockPartition(int p) { - if (!cctx.preloadEnabled()) + if (!cctx.rebalanceEnabled()) return; if (!cctx.isNear()) { Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -824,11 +824,11 @@ 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 @@ } for (GridCacheContext cacheCtx : cctx.cacheContexts()) { - long delay = cacheCtx.config().getPreloadPartitionedDelay(); + long delay = cacheCtx.config().getRebalancePartitionedDelay(); GridDhtPreloaderAssignments assigns = null; Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -60,7 +60,7 @@ 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 @@ /** Map of preload finish futures grouped by preload order. */ private final NavigableMap> preloadFuts; - /** Maximum detected preload order. */ - private int maxPreloadOrder; + /** Maximum detected rebalance order. */ + private int maxRebalanceOrder; /** System cache names. */ private final Set sysCaches; @@ -169,8 +169,8 @@ 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 @@ 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 @@ 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 @@ "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 @@ 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 @@ 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 @@ 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 @@ for (Map.Entry> 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 fut = (GridCompoundFuture)preloadFuts .get(order); @@ -1331,9 +1331,9 @@ 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(); } } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -49,7 +49,7 @@ 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 @@ cache.setQueryIndexEnabled(false); cache.setCacheStoreFactory(null); cache.setEagerTtl(true); - cache.setPreloadMode(SYNC); + cache.setRebalanceMode(SYNC); return cache; } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -529,7 +529,7 @@ 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> it = map.values().iterator(); it.hasNext();) { GridDhtCacheEntry cached = it.next(); @@ -543,7 +543,7 @@ 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); } } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -1070,7 +1070,7 @@ 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 info : res.preloadEntries()) { try { @@ -1080,7 +1080,7 @@ 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); } } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -244,7 +244,7 @@ } } - 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 @@ 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 @@ } 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 @@ GridDhtPartitionState state = locPart.state(); if (state == MOVING) { - if (cctx.preloadEnabled()) { + if (cctx.rebalanceEnabled()) { Collection owners = owners(p); // If there are no other owners, then become an owner. @@ -414,7 +414,7 @@ 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 @@ /** {@inheritDoc} */ @Override public List owners(int p, long topVer) { - if (!cctx.preloadEnabled()) + if (!cctx.rebalanceEnabled()) return ownersAndMoving(p, topVer); return nodes(p, topVer, OWNING); @@ -672,7 +672,7 @@ /** {@inheritDoc} */ @Override public List moving(int p) { - if (!cctx.preloadEnabled()) + if (!cctx.rebalanceEnabled()) return ownersAndMoving(p, -1); return nodes(p, -1, MOVING); Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -1249,7 +1249,7 @@ 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 info : res.preloadEntries()) { GridCacheContext cacheCtx = cctx.cacheContext(info.cacheId()); @@ -1264,7 +1264,7 @@ 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); } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -292,10 +292,10 @@ 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 @@ List 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 @@ 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 @@ 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 @@ 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 @@ 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 retryKeys = F.view( keys, F0.notIn(missedKeys), @@ -488,7 +488,7 @@ 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 @@ )) { 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 @@ } 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 { Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -72,7 +72,7 @@ /** Preload predicate. */ private IgnitePredicate> 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 @@ 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 @@ syncFut.onDone(); } - timeout = new AtomicLong(cctx.config().getPreloadTimeout()); + timeout = new AtomicLong(cctx.config().getRebalanceTimeout()); } /** @@ -161,7 +161,7 @@ } /** - * @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 @@ 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>() { @Override public void apply(IgniteInternalFuture t) { @@ -215,7 +215,7 @@ }); } 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 @@ 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 @@ final GridDhtPartitionsExchangeFuture 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 @@ // 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 @@ 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 @@ )) { 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ /** {@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 @@ 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 @@ } 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 @@ 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 @@ // No assignments for disabled preloader. GridDhtPartitionTopology top = cctx.dht().topology(); - if (!cctx.preloadEnabled()) + if (!cctx.rebalanceEnabled()) return new GridDhtPreloaderAssignments<>(exchFut, top.topologyVersion()); int partCnt = cctx.affinity().partitions(); Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -83,7 +83,7 @@ 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 @@ * @return Size of this thread pool. */ int poolSize() { - return cctx.config().getPreloadThreadPoolSize(); + return cctx.config().getRebalanceThreadPoolSize(); } /** @@ -153,14 +153,14 @@ 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 @@ GridDhtPartitionSupplyMessage 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 @@ break; } - if (s.messageSize() >= cctx.config().getPreloadBatchSize()) { + if (s.messageSize() >= cctx.config().getRebalanceBatchSize()) { ack = true; if (!reply(node, d, s)) @@ -316,7 +316,7 @@ 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 @@ 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 @@ 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 @@ break; } - if (s.messageSize() >= cctx.config().getPreloadBatchSize()) { + if (s.messageSize() >= cctx.config().getRebalanceBatchSize()) { ack = true; if (!reply(node, d, s)) @@ -456,7 +456,7 @@ 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); } } Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -126,7 +126,7 @@ /** {@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>() { @@ -165,7 +165,7 @@ /** {@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 @@ @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 @@ 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() { @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 @@ 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) Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePreloadConfiguration.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 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 @@ /** * @return Cache preload mode. */ - public CachePreloadMode mode() { + public CacheRebalanceMode mode() { return mode; } Index: ../incubator-ignite/modules/core/src/test/config/discovery-stress.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/discovery-stress.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/discovery-stress.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -29,7 +29,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/example-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/example-cache.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/example-cache.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -130,8 +130,8 @@ - - + + Index: ../incubator-ignite/modules/core/src/test/config/load/dsi-49-server-production.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/load/dsi-49-server-production.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/load/dsi-49-server-production.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -42,7 +42,7 @@ - + - + Index: ../incubator-ignite/modules/core/src/test/config/load/dsi-load-client.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/load/dsi-load-client.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/load/dsi-load-client.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/load/dsi-load-server.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/load/dsi-load-server.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/load/dsi-load-server.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/spring-cache-load.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/spring-cache-load.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/spring-cache-load.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -51,7 +51,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/spring-multicache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/spring-multicache.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/spring-multicache.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -70,7 +70,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -225,7 +225,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-1.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-1.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-1.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -78,7 +78,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-2.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-2.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-2.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -78,7 +78,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-3.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-3.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/config/websession/spring-cache-3.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -78,7 +78,7 @@ - + Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -35,7 +35,7 @@ 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 @@ cCfg.setCacheMode(PARTITIONED); cCfg.setBackups(1); cCfg.setDistributionMode(NEAR_PARTITIONED); - cCfg.setPreloadMode(SYNC); + cCfg.setRebalanceMode(SYNC); cCfg.setQueryIndexEnabled(false); cCfg.setWriteSynchronizationMode(FULL_SYNC); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -30,7 +30,7 @@ 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 @@ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); return cfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ cc.setSwapEnabled(false); cc.setAtomicityMode(atomicityMode()); cc.setDistributionMode(distributionMode()); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -47,7 +47,7 @@ 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 @@ cc.setEvictNearSynchronized(false); cc.setSwapEnabled(false); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); c.setCacheConfiguration(cc); } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -48,7 +48,7 @@ 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 @@ new C1() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setPreloadMode(NONE); + cfg.setRebalanceMode(NONE); return null; } }, new C1() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setPreloadMode(ASYNC); + cfg.setRebalanceMode(ASYNC); return null; } } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -26,7 +26,7 @@ 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 @@ CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); dfltCacheCfg.setCacheMode(PARTITIONED); - dfltCacheCfg.setPreloadMode(ASYNC); + dfltCacheCfg.setRebalanceMode(ASYNC); dfltCacheCfg.setWriteSynchronizationMode(FULL_SYNC); dfltCacheCfg.setAffinity(new CacheConsistentHashAffinityFunction()); @@ -89,14 +89,14 @@ 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)) { Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -33,7 +33,7 @@ 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 @@ cfg.setCacheMode(PARTITIONED); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); cfg.setStoreValueBytes(true); cfg.setAtomicityMode(TRANSACTIONAL); cfg.setDistributionMode(NEAR_PARTITIONED); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ cc.setSwapEnabled(false); cc.setAtomicityMode(atomicityMode()); cc.setDistributionMode(distributionMode()); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); cc.setReadThrough(true); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -36,7 +36,7 @@ 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 @@ cache.setAtomicWriteOrderMode(PRIMARY); cache.setWriteSynchronizationMode(FULL_SYNC); cache.setBackups(1); - cache.setPreloadMode(SYNC); + cache.setRebalanceMode(SYNC); cfg.setCacheConfiguration(cache); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ cfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); return cfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -28,7 +28,7 @@ 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 @@ cfg.setName(name); cfg.setCacheMode(cacheMode); - cfg.setPreloadOrder(preloadOrder); - cfg.setPreloadMode(ASYNC); + cfg.setRebalanceOrder(preloadOrder); + cfg.setRebalanceMode(ASYNC); return cfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -37,7 +37,7 @@ 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 @@ private final AtomicInteger idxGen = new AtomicInteger(); /** */ - private CachePreloadMode mode = SYNC; + private CacheRebalanceMode mode = SYNC; /** */ private boolean offheap; @@ -82,7 +82,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ cc.setCacheMode(PARTITIONED); cc.setBackups(1); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setWriteSynchronizationMode(FULL_SYNC); cc.setSwapEnabled(true); cc.setEvictNearSynchronized(false); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUPS); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -40,7 +40,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -30,7 +30,7 @@ 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 @@ CacheConfiguration cc = super.cacheConfiguration(gridName); cc.setQueryIndexEnabled(false); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); return cc; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -33,7 +33,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -60,7 +60,7 @@ ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setMemoryMode(memMode); ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024); - ccfg.setPreloadMode(CachePreloadMode.SYNC); + ccfg.setRebalanceMode(CacheRebalanceMode.SYNC); return ccfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ cCfg.setAtomicityMode(atomicityMode()); cCfg.setAtomicWriteOrderMode(writeOrderMode()); cCfg.setDistributionMode(distributionMode()); - cCfg.setPreloadMode(SYNC); + cCfg.setRebalanceMode(SYNC); cCfg.setWriteSynchronizationMode(FULL_SYNC); cCfg.setBackups(1); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractStopBusySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -100,7 +100,7 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -29,7 +29,7 @@ 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 @@ ccfg.setMemoryMode(colCfg.getMemoryMode()); ccfg.setDistributionMode(colCfg.getDistributionMode()); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); cfg.setCacheConfiguration(ccfg); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -25,7 +25,7 @@ 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 @@ cc.setCacheMode(PARTITIONED); cc.setBackups(1); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setEvictionPolicy(new CacheFifoEvictionPolicy(100)); c.setCacheConfiguration(cc); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setBackups(1); cfg.setCacheConfiguration(cacheCfg); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setBackups(0); return cc; Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -33,7 +33,7 @@ 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 @@ 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 @@ private static volatile int idx = -1; /** Preload mode. */ - protected CachePreloadMode preloadMode = ASYNC; + protected CacheRebalanceMode preloadMode = ASYNC; /** */ protected int preloadBatchSize = DFLT_BATCH_SIZE; Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -28,7 +28,7 @@ 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 @@ ccfg.setAtomicityMode(TRANSACTIONAL); ccfg.setWriteSynchronizationMode(PRIMARY_SYNC); ccfg.setBackups(1); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); ccfg.setDistributionMode(distributionMode()); cfg.setCacheConfiguration(ccfg); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -52,7 +52,7 @@ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); - ccfg.setPreloadMode(CachePreloadMode.SYNC); + ccfg.setRebalanceMode(CacheRebalanceMode.SYNC); return ccfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -30,7 +30,7 @@ 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 @@ @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 @@ cache1.preloader().syncFuture().get(); - Collection evts = g1.events().localQuery(F.alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); + Collection evts = g1.events().localQuery(F.alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED); assertEquals("Expected all entries are preloaded.", KEYS_NUM, evts.size()); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -35,7 +35,7 @@ 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 @@ cacheCfg.setCacheMode(cacheMode()); cacheCfg.setWriteSynchronizationMode(FULL_ASYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -42,7 +42,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -35,7 +35,7 @@ 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 @@ cacheCfg.setBackups(BACKUPS); cacheCfg.setAffinity(aff); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadEventsAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(getCacheMode()); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); @@ -104,7 +104,7 @@ Ignite g2 = startGrid("g2"); - Collection evts = g2.events().localQuery(F.alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); + Collection evts = g2.events().localQuery(F.alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED); checkPreloadEvents(evts, g2, U.toIntList(new int[]{1, 2, 3})); } @@ -119,7 +119,7 @@ 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()); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -29,7 +29,7 @@ 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 @@ 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; Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -32,7 +32,7 @@ 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 @@ 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 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ ccfg.setCacheMode(cacheMode()); ccfg.setWriteSynchronizationMode(FULL_SYNC); ccfg.setDistributionMode(partitionDistributionMode()); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); if (cacheMode() == CacheMode.PARTITIONED) ccfg.setBackups(1); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -37,7 +37,7 @@ 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 @@ ccfg.setAtomicityMode(ATOMIC); ccfg.setDistributionMode(NEAR_PARTITIONED); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); assert writeOrderMode != null; Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -27,7 +27,7 @@ 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 @@ cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); TcpDiscoverySpi spi = new TcpDiscoverySpi(); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -38,7 +38,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -39,7 +39,7 @@ 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 @@ CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); - cacheCfg.setPreloadMode(NONE); + cacheCfg.setRebalanceMode(NONE); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cacheCfg.setSwapEnabled(false); cacheCfg.setEvictSynchronized(true); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -36,7 +36,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -30,7 +30,7 @@ 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 @@ cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setBackups(BACKUPS); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -30,7 +30,7 @@ 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 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -38,7 +38,7 @@ 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 @@ 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 @@ return true; } - }, EVTS_CACHE_PRELOAD); + }, EVTS_CACHE_REBALANCE); list.add(g); } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -47,7 +47,7 @@ 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 @@ cc.setCacheMode(PARTITIONED); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setPreloadMode(preloadMode); + cc.setRebalanceMode(preloadMode); cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 521)); cc.setBackups(1); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ private int backups; /** Preload mode. */ - private CachePreloadMode preloadMode; + private CacheRebalanceMode preloadMode; /** IP finder. */ private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -69,7 +69,7 @@ cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setPreloadMode(preloadMode); + cacheCfg.setRebalanceMode(preloadMode); cacheCfg.setBackups(backups); TcpDiscoverySpi disco = new TcpDiscoverySpi(); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -36,7 +36,7 @@ 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 @@ 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 @@ 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 @@ * @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 @@ futs.add(waitForLocalEvent(last.events(), new P1() { @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 @@ return true; } - }, EVTS_CACHE_PRELOAD); + }, EVTS_CACHE_REBALANCE); list.add(g); } @@ -536,14 +536,14 @@ for (Ignite gg : ignites) futs.add(waitForLocalEvent(gg.events(), new P1() { @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 @@ 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 nodes = ignite.cluster().nodes(); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ * @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; } /** Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -24,7 +24,7 @@ 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 @@ cfg.setCacheMode(PARTITIONED); cfg.setBackups(gridCount() - 1); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); cfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setDistributionMode(PARTITIONED_ONLY); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -30,7 +30,7 @@ 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 @@ private boolean replicatedAffinity = true; /** */ - private CachePreloadMode preloadMode = SYNC; + private CacheRebalanceMode preloadMode = SYNC; /** {@inheritDoc} */ @Override protected CacheConfiguration cacheConfiguration() { @@ -76,7 +76,7 @@ } }); - cacheCfg.setPreloadMode(preloadMode); + cacheCfg.setRebalanceMode(preloadMode); return cacheCfg; } @@ -118,7 +118,7 @@ for (Object key : g2Keys) g2.jcache(null).put(key, "changed val"); - Collection evts = g2.events().localQuery(F.alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_LOADED); + Collection evts = g2.events().localQuery(F.alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_LOADED); checkPreloadEvents(evts, g2, g2Keys); } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -40,7 +40,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -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 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 @@ 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 @@ Thread.sleep(5000); Collection objEvts = - g1.events().localQuery(F.alwaysTrue(), EVT_CACHE_PRELOAD_OBJECT_UNLOADED); + g1.events().localQuery(F.alwaysTrue(), EVT_CACHE_REBALANCE_OBJECT_UNLOADED); checkObjectUnloadEvents(objEvts, g1, g2Keys); Collection partEvts = - g1.events().localQuery(F.alwaysTrue(), EVT_CACHE_PRELOAD_PART_UNLOADED); + g1.events().localQuery(F.alwaysTrue(), EVT_CACHE_REBALANCE_PART_UNLOADED); checkPartitionUnloadEvents(partEvts, g1, dht(g2.jcache(null)).topology().localPartitions()); } @@ -114,7 +113,7 @@ 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 @@ assertEquals(parts.size(), evts.size()); for (Event evt : evts) { - CachePreloadingEvent unloadEvt = (CachePreloadingEvent)evt; + CacheRebalancingEvent unloadEvt = (CacheRebalancingEvent)evt; final int part = unloadEvt.partition(); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -41,7 +41,7 @@ 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 @@ ccfg.setAtomicWriteOrderMode(writeOrder); ccfg.setWriteSynchronizationMode(writeSync); - ccfg.setPreloadMode(SYNC); + ccfg.setRebalanceMode(SYNC); return ccfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -33,7 +33,7 @@ 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 @@ cc.setAffinity(affinityFunction()); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); c.setCacheConfiguration(cc); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -23,7 +23,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.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheRebalanceMode.*; /** * Multi-node tests for partitioned cache. @@ -50,7 +50,7 @@ @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()); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -23,7 +23,7 @@ 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 @@ cfg.setCacheMode(PARTITIONED); cfg.setBackups(gridCount() - 1); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); cfg.setWriteSynchronizationMode(FULL_SYNC); cfg.setAtomicityMode(ATOMIC); cfg.setAtomicWriteOrderMode(PRIMARY); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -20,7 +20,6 @@ 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.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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); TcpDiscoverySpi spi = new TcpDiscoverySpi(); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -33,7 +33,7 @@ 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 @@ 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)); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -37,7 +37,7 @@ 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 @@ cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setPreloadMode(NONE); + cacheCfg.setRebalanceMode(NONE); cacheCfg.setAffinity(aff); cacheCfg.setSwapEnabled(false); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -36,7 +36,7 @@ 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 @@ cacheCfg.setDistributionMode(NEAR_PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setBackups(backups); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cfg.setCacheConfiguration(cacheCfg); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ cc.setAffinity(aff); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); c.setCacheConfiguration(cc); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -40,7 +40,7 @@ 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 @@ cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setBackups(BACKUPS); cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicOpSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -37,7 +37,7 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEventSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -24,7 +24,7 @@ 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 @@ // 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; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -86,7 +86,7 @@ cfg.setEvictionPolicy(null); cfg.setBackups(1); cfg.setDistributionMode(PARTITIONED_ONLY); - cfg.setPreloadPartitionedDelay(-1); + cfg.setRebalancePartitionedDelay(-1); cfg.setBackups(1); cfg.setStatisticsEnabled(true); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -21,7 +21,7 @@ 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 @@ cfg.setCacheMode(PARTITIONED); cfg.setBackups(gridCount() - 1); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); cfg.setWriteSynchronizationMode(FULL_SYNC); return cfg; Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -42,7 +42,7 @@ 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 @@ // Default cache configuration. CacheConfiguration cacheCfg = defaultCacheConfiguration(); - cacheCfg.setPreloadMode(NONE); + cacheCfg.setRebalanceMode(NONE); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(NEAR_PARTITIONED); cacheCfg.setAtomicityMode(TRANSACTIONAL); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cc = super.cacheConfiguration(gridName); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); return cc; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -43,8 +43,8 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -42,8 +42,8 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -33,7 +33,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -75,7 +75,7 @@ // 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -78,7 +78,7 @@ cc.setCacheMode(CacheMode.PARTITIONED); cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18)); cc.setBackups(1); - cc.setPreloadMode(CachePreloadMode.SYNC); + cc.setRebalanceMode(CacheRebalanceMode.SYNC); c.setCacheConfiguration(cc); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -27,7 +27,7 @@ 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 @@ cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_ASYNC); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); TcpDiscoverySpi spi = new TcpDiscoverySpi(); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -36,7 +36,7 @@ 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 @@ CacheConfiguration cc = defaultCacheConfiguration(); - cc.setPreloadMode(NONE); + cc.setRebalanceMode(NONE); cc.setCacheMode(REPLICATED); cc.setWriteSynchronizationMode(FULL_SYNC); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -21,7 +21,7 @@ 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 @@ cc.setStartSize(20); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); - cc.setPreloadBatchSize(20); + cc.setRebalanceBatchSize(20); c.setCacheConfiguration(cc); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -32,7 +32,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -38,7 +38,7 @@ 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 @@ */ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { /** */ - private CachePreloadMode preloadMode = ASYNC; + private CacheRebalanceMode preloadMode = ASYNC; /** */ private int batchSize = 4096; @@ -104,9 +104,9 @@ 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 @@ for (int i = 0; i < 3; i++) { evts = g2.events().localQuery(F.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 @@ Iterator 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 cache2 = ((IgniteKernal)g2).internalCache(null); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -71,16 +71,16 @@ ignite.events().localListen(new IgnitePredicate() { @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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -35,7 +35,7 @@ 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 @@ cc.setSwapEnabled(false); cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); cc.setEvictionFilter(filter); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setAtomicityMode(TRANSACTIONAL); if (mode == PARTITIONED) Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -31,7 +31,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -29,7 +29,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -52,7 +52,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -40,7 +40,7 @@ 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 @@ cache.setAtomicityMode(atomicityMode()); cache.setDistributionMode(distributionMode()); cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setPreloadMode(SYNC); + cache.setRebalanceMode(SYNC); if (cacheMode() == PARTITIONED) cache.setBackups(1); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -43,7 +43,7 @@ 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 @@ } 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 @@ metaCfg.setCacheMode(REPLICATED); metaCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - metaCfg.setPreloadMode(SYNC); + metaCfg.setRebalanceMode(SYNC); metaCfg.setQueryIndexEnabled(false); metaCfg.setAtomicityMode(TRANSACTIONAL); @@ -610,7 +610,7 @@ return true; } - }, EVT_CACHE_PRELOAD_STOPPED); + }, EVT_CACHE_REBALANCE_STOPPED); } Ignite g = startGrid(GRID_CNT); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -27,7 +27,7 @@ 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 @@ cacheCfg.setEvictionPolicy(new CacheLruEvictionPolicy(100000)); cacheCfg.setBackups(1); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); cfg.setCacheConfiguration(cacheCfg); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -82,8 +82,8 @@ - - + + Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -110,8 +110,8 @@ - - + + Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -68,7 +68,7 @@ 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); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -25,7 +25,7 @@ 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 @@ cfg.setCacheMode(PARTITIONED); cfg.setBackups(1); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setPreloadMode(SYNC); + cfg.setRebalanceMode(SYNC); return cfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -39,7 +39,7 @@ 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 @@ cacheCfg.setCacheMode(CacheMode.PARTITIONED); cacheCfg.setWriteSynchronizationMode(FULL_ASYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); return cacheCfg; } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -44,7 +44,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -130,8 +130,8 @@ --> - - + + - - + + - - + + Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -41,7 +41,7 @@ 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 @@ cache.setCacheMode(cacheMode()); cache.setAtomicityMode(atomicityMode()); cache.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); - cache.setPreloadMode(SYNC); + cache.setRebalanceMode(SYNC); CacheQueryConfiguration qcfg = new CacheQueryConfiguration(); Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -49,7 +49,7 @@ 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 @@ cc.setReadThrough(true); cc.setWriteThrough(true); cc.setLoadPreviousValue(true); - cc.setPreloadMode(SYNC); + cc.setRebalanceMode(SYNC); cc.setSwapEnabled(true); cc.setEvictNearSynchronized(false); Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -36,7 +36,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTestNewApi.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -37,7 +37,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -34,7 +34,7 @@ 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 @@ 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); Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -140,7 +140,7 @@ 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() { @SuppressWarnings({"BusyWait"}) @@ -171,12 +171,12 @@ 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; } Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -19,7 +19,6 @@ 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.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 @@ 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(); Index: ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -37,7 +37,7 @@ 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 @@ CacheConfiguration cache = defaultCacheConfiguration(); cache.setCacheMode(PARTITIONED); - cache.setPreloadMode(NONE); + cache.setRebalanceMode(NONE); cfg.setCacheConfiguration(cache); Index: ../incubator-ignite/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -159,7 +159,7 @@ 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 @@ 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" } } Index: ../incubator-ignite/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala (revision dc04e98c616ec68f13d591c1536fb2b275f20744) @@ -2424,8 +2424,8 @@ 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 ) Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/IgniteCache.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/IgniteCache.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/IgniteCache.java (revision de619d9c8042e6957093c0ef9404f067ca1af397) @@ -20,6 +20,8 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; @@ -454,6 +456,28 @@ @IgniteAsyncSupported public Map> invokeAll(Set keys, IgniteEntryProcessor entryProcessor, Object... args); + + /** + * Forces this cache node to re-balance its partitions. This method is usually used when + * {@link CacheConfiguration#getRebalancePartitionedDelay()} configuration parameter has non-zero value. + * When many nodes are started or stopped almost concurrently, it is more efficient to delay + * rebalancing until the node topology is stable to make sure that no redundant re-partitioning + * happens. + *

    + * 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#getRebalancePartitionedDelay() rebalanceDelay} expires. To place nodes + * on the same place in consistent hash ring, use + * {@link CacheConsistentHashAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)} to make sure that + * a node maps to the same hash ID if re-started. + *

    + * See {@link CacheConfiguration#getRebalancePartitionedDelay()} for more information on how to configure + * rebalance re-partition delay. + *

    + * @return Future that will be completed when rebalancing is finished. + */ + public IgniteFuture forceRebalancing(); /** * Gets snapshot metrics (statistics) for this cache. Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java (revision de619d9c8042e6957093c0ef9404f067ca1af397) @@ -1443,6 +1443,13 @@ } /** {@inheritDoc} */ + @Override public IgniteFuture forceRebalancing() { + ctx.preloader().forcePreload(); + + return new IgniteFutureImpl<>(ctx.preloader().syncFuture()); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgniteCacheProxy.class, this); } Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java (revision de619d9c8042e6957093c0ef9404f067ca1af397) @@ -59,7 +59,7 @@ ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); ccfg.setCacheMode(CacheMode.PARTITIONED); - ccfg.setPreloadPartitionedDelay(-1); + ccfg.setRebalancePartitionedDelay(-1); return ccfg; } @@ -74,7 +74,7 @@ try { for (int i = 0; i < GRID_CNT - 1; i++) - ((IgniteKernal)grid(i)).cache(null).forceRepartition().get(); + grid(i).jcache(null).forceRebalancing().get(); startGrid(GRID_CNT - 1); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java (revision dc04e98c616ec68f13d591c1536fb2b275f20744) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java (revision de619d9c8042e6957093c0ef9404f067ca1af397) @@ -150,7 +150,7 @@ if (forceRepartition) for (int i = 0; i < GRID_CNT; i++) - cache(i).forceRepartition(); + jcache(i).forceRebalancing(); Ignite newIgnite = startGrid(GRID_CNT + 1); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java (revision de619d9c8042e6957093c0ef9404f067ca1af397) @@ -30,7 +30,7 @@ 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.*; @@ -121,7 +121,7 @@ for (int i = 0; i < GRID_CNT; i++) // Wait for preloader. - cache(i).forceRepartition().get(); + jcache(i).forceRebalancing().get(); for (int i = 0; i < GRID_CNT; i++) { for (String key : keys) @@ -209,7 +209,7 @@ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setPreloadMode(ASYNC); + cfg.setRebalanceMode(ASYNC); cfg.setWriteSynchronizationMode(FULL_SYNC); Index: ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java (revision 11efb91874a547c408dcac58f0651725ad518abe) +++ ../incubator-ignite/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java (revision de619d9c8042e6957093c0ef9404f067ca1af397) @@ -42,7 +42,7 @@ 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 @@ 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 @@ 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 @@ return true; } - }, EventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_REBALANCE_STOPPED); g2.events().localListen(new IgnitePredicate() { @Override public boolean apply(Event evt) { @@ -138,7 +138,7 @@ return true; } - }, EventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_REBALANCE_STOPPED); info("Beginning to wait for cache1 repartition."); @@ -149,7 +149,7 @@ checkMaps(false, d0, d1, d2); // Force preload. - internalCache(c1).forceRepartition(); + c1.forceRebalancing(); l1.await(); @@ -160,7 +160,7 @@ info("Beginning to wait for cache2 repartition."); // Force preload. - internalCache(c2).forceRepartition(); + c2.forceRebalancing(); l2.await(); @@ -207,7 +207,7 @@ return true; } - }, EventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_REBALANCE_STOPPED); g2.events().localListen(new IgnitePredicate() { @Override public boolean apply(Event evt) { @@ -215,7 +215,7 @@ return true; } - }, EventType.EVT_CACHE_PRELOAD_STOPPED); + }, EventType.EVT_CACHE_REBALANCE_STOPPED); U.sleep(1000); @@ -245,7 +245,7 @@ /** @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 @@ /** @throws Exception If failed. */ public void testManualPreloadSyncMode() throws Exception { - preloadMode = CachePreloadMode.SYNC; + preloadMode = CacheRebalanceMode.SYNC; delay = -1; try { @@ -352,7 +352,7 @@ long start = System.currentTimeMillis(); - internalCache(g.jcache(null)).forceRepartition().get(); + g.jcache(null).forceRebalancing().get(); info(">>> Finished preloading of empty cache in " + (System.currentTimeMillis() - start) + "ms."); }