Merge branch 'sprint-2' into ignite-383
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6320be9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6320be9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6320be9 Branch: refs/heads/ignite-411 Commit: d6320be9172ea62fcbf07c21da70e33568dc3825 Parents: 026c09a 314bf52 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Mar 10 12:28:02 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Mar 10 12:28:02 2015 +0300 ---------------------------------------------------------------------- DISCLAIMER.txt | 15 + README.txt | 25 + RELEASE_NOTES.txt | 18 + assembly/release-base.xml | 20 +- assembly/release-fabric.xml | 5 - bin/ignitevisorcmd.bat | 7 +- bin/ignitevisorcmd.sh | 7 +- docs/ignite_readme.md | 100 -- docs/ignite_readme.pdf | Bin 77136 -> 0 bytes docs/release_notes.md | 16 - docs/release_notes.pdf | Bin 33174 -> 0 bytes docs/wiki/basic-concepts/async-support.md | 75 - docs/wiki/basic-concepts/getting-started.md | 218 --- docs/wiki/basic-concepts/ignite-life-cycel.md | 105 -- docs/wiki/basic-concepts/maven-setup.md | 68 - docs/wiki/basic-concepts/what-is-ignite.md | 31 - docs/wiki/basic-concepts/zero-deployment.md | 56 - docs/wiki/clustering/aws-config.md | 42 - docs/wiki/clustering/cluster-config.md | 176 -- docs/wiki/clustering/cluster-groups.md | 210 --- docs/wiki/clustering/cluster.md | 128 -- docs/wiki/clustering/leader-election.md | 59 - docs/wiki/clustering/network-config.md | 101 -- docs/wiki/clustering/node-local-map.md | 35 - docs/wiki/compute-grid/checkpointing.md | 238 --- .../compute-grid/collocate-compute-and-data.md | 29 - docs/wiki/compute-grid/compute-grid.md | 56 - docs/wiki/compute-grid/compute-tasks.md | 105 -- docs/wiki/compute-grid/distributed-closures.md | 107 -- docs/wiki/compute-grid/executor-service.md | 23 - docs/wiki/compute-grid/fault-tolerance.md | 79 - docs/wiki/compute-grid/job-scheduling.md | 69 - docs/wiki/compute-grid/load-balancing.md | 59 - docs/wiki/data-grid/affinity-collocation.md | 78 - docs/wiki/data-grid/automatic-db-integration.md | 102 -- docs/wiki/data-grid/cache-modes.md | 237 --- docs/wiki/data-grid/cache-queries.md | 164 -- docs/wiki/data-grid/data-grid.md | 68 - docs/wiki/data-grid/data-loading.md | 77 - docs/wiki/data-grid/evictions.md | 86 - docs/wiki/data-grid/hibernate-l2-cache.md | 173 -- docs/wiki/data-grid/jcache.md | 99 -- docs/wiki/data-grid/off-heap-memory.md | 180 -- docs/wiki/data-grid/persistent-store.md | 111 -- docs/wiki/data-grid/rebalancing.md | 105 -- docs/wiki/data-grid/transactions.md | 127 -- docs/wiki/data-grid/web-session-clustering.md | 236 --- .../distributed-data-structures/atomic-types.md | 97 - .../countdownlatch.md | 24 - .../distributed-data-structures/id-generator.md | 40 - .../queue-and-set.md | 116 -- .../distributed-events/automatic-batching.md | 16 - docs/wiki/distributed-events/events.md | 101 -- docs/wiki/distributed-file-system/igfs.md | 1 - docs/wiki/distributed-messaging/messaging.md | 73 - docs/wiki/http/configuration.md | 58 - docs/wiki/http/rest-api.md | 1646 ----------------- docs/wiki/release-notes/release-notes.md | 13 - docs/wiki/service-grid/cluster-singletons.md | 94 - docs/wiki/service-grid/service-configuration.md | 33 - docs/wiki/service-grid/service-example.md | 94 - docs/wiki/service-grid/service-grid.md | 62 - .../ComputeFibonacciContinuationExample.java | 12 +- .../examples/datagrid/CacheApiExample.java | 2 +- .../examples/ScalarContinuationExample.scala | 12 +- .../client/suite/IgniteClientTestSuite.java | 3 +- .../org/apache/ignite/IgniteFileSystem.java | 24 +- .../apache/ignite/IgniteSystemProperties.java | 35 +- .../org/apache/ignite/cache/CacheManager.java | 1 - .../igfs/IgfsDirectoryNotEmptyException.java | 42 + .../ignite/igfs/IgfsFileNotFoundException.java | 44 - .../ignite/igfs/IgfsPathNotFoundException.java | 44 + .../igfs/secondary/IgfsSecondaryFileSystem.java | 10 +- .../internal/ComputeTaskInternalFuture.java | 44 +- .../ignite/internal/GridJobContextImpl.java | 6 +- .../ignite/internal/GridJobSessionImpl.java | 2 +- .../ignite/internal/GridKernalGatewayImpl.java | 26 - .../ignite/internal/GridTaskSessionImpl.java | 2 +- .../ignite/internal/IgniteInternalFuture.java | 79 +- .../apache/ignite/internal/IgniteKernal.java | 24 +- .../internal/client/GridClientFuture.java | 9 +- .../client/impl/GridClientDataImpl.java | 2 +- .../client/impl/GridClientFutureAdapter.java | 26 +- .../connection/GridClientNioTcpConnection.java | 5 +- .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../internal/cluster/IgniteClusterImpl.java | 9 +- .../internal/executor/GridExecutorService.java | 2 +- .../igfs/common/IgfsControlResponse.java | 5 +- .../managers/communication/GridIoManager.java | 43 +- .../discovery/GridDiscoveryManager.java | 10 +- .../eventstorage/GridEventStorageManager.java | 6 +- .../affinity/GridAffinityAssignmentCache.java | 17 +- .../affinity/GridAffinityProcessor.java | 2 +- .../processors/cache/GridCacheAdapter.java | 91 +- .../cache/GridCacheAffinityManager.java | 2 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheEvictionManager.java | 27 +- .../processors/cache/GridCacheGateway.java | 6 + .../processors/cache/GridCacheIoManager.java | 77 +- .../processors/cache/GridCacheMapEntry.java | 14 +- .../processors/cache/GridCacheMessage.java | 7 - .../cache/GridCacheMultiTxFuture.java | 54 +- .../processors/cache/GridCacheMvcc.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 34 +- .../GridCachePartitionExchangeManager.java | 6 +- .../cache/GridCachePreloaderAdapter.java | 4 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../cache/GridCacheProjectionImpl.java | 12 +- .../cache/GridCacheSharedContext.java | 2 +- .../processors/cache/GridCacheUtils.java | 11 +- .../processors/cache/IgniteCacheProxy.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 25 +- .../distributed/GridCacheTxFinishSync.java | 2 +- .../GridDistributedCacheAdapter.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 6 +- .../dht/GridDhtAssignmentFetchFuture.java | 22 +- .../distributed/dht/GridDhtCacheAdapter.java | 9 +- .../distributed/dht/GridDhtCacheEntry.java | 14 +- .../distributed/dht/GridDhtEmbeddedFuture.java | 43 +- .../distributed/dht/GridDhtFinishedFuture.java | 22 +- .../cache/distributed/dht/GridDhtGetFuture.java | 45 +- .../distributed/dht/GridDhtLocalPartition.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 35 +- .../dht/GridDhtTransactionalCacheAdapter.java | 35 +- .../distributed/dht/GridDhtTxFinishFuture.java | 38 +- .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 16 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 48 +- .../dht/GridPartitionedGetFuture.java | 44 +- .../dht/atomic/GridDhtAtomicCache.java | 20 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 20 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 43 +- .../dht/colocated/GridDhtColocatedCache.java | 30 +- .../colocated/GridDhtColocatedLockFuture.java | 43 +- .../dht/preloader/GridDhtForceKeysFuture.java | 43 +- .../preloader/GridDhtPartitionDemandPool.java | 9 +- .../GridDhtPartitionsExchangeFuture.java | 48 +- .../dht/preloader/GridDhtPreloader.java | 22 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 6 +- .../distributed/near/GridNearGetFuture.java | 51 +- .../distributed/near/GridNearLockFuture.java | 43 +- .../near/GridNearTransactionalCache.java | 2 +- .../near/GridNearTxFinishFuture.java | 32 +- .../cache/distributed/near/GridNearTxLocal.java | 83 +- .../near/GridNearTxPrepareFuture.java | 48 +- .../processors/cache/local/GridLocalCache.java | 2 +- .../cache/local/GridLocalLockFuture.java | 23 +- .../processors/cache/local/GridLocalTx.java | 10 +- .../cache/local/GridLocalTxFuture.java | 59 +- .../local/atomic/GridLocalAtomicCache.java | 8 +- .../GridCacheDistributedFieldsQueryFuture.java | 13 +- .../query/GridCacheDistributedQueryFuture.java | 11 - .../query/GridCacheDistributedQueryManager.java | 4 +- .../query/GridCacheFieldsQueryErrorFuture.java | 53 - .../query/GridCacheLocalFieldsQueryFuture.java | 13 +- .../cache/query/GridCacheLocalQueryFuture.java | 15 +- .../cache/query/GridCacheQueryErrorFuture.java | 5 +- .../query/GridCacheQueryFutureAdapter.java | 14 +- .../cache/query/GridCacheQueryManager.java | 11 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 25 +- .../transactions/IgniteTxLocalAdapter.java | 320 ++-- .../cache/transactions/IgniteTxManager.java | 18 +- .../transactions/TransactionProxyImpl.java | 2 +- .../closure/GridClosureProcessor.java | 38 +- .../continuous/GridContinuousProcessor.java | 36 +- .../dataload/GridDataLoaderFuture.java | 16 - .../dataload/GridDataLoaderProcessor.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 35 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../processors/hadoop/HadoopNoopProcessor.java | 2 +- .../processors/igfs/IgfsDataManager.java | 36 +- .../processors/igfs/IgfsDeleteWorker.java | 2 +- .../igfs/IgfsDirectoryNotEmptyException.java | 44 - .../internal/processors/igfs/IgfsImpl.java | 30 +- .../processors/igfs/IgfsInputStreamImpl.java | 10 +- .../processors/igfs/IgfsIpcHandler.java | 4 +- .../processors/igfs/IgfsMetaManager.java | 22 +- .../processors/igfs/IgfsOutputStreamImpl.java | 2 +- .../internal/processors/igfs/IgfsServer.java | 3 +- .../processors/job/GridJobProcessor.java | 4 +- .../processors/query/GridQueryProcessor.java | 6 +- .../processors/resource/GridResourceUtils.java | 4 +- .../processors/rest/GridRestProcessor.java | 14 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../DataStructuresCommandHandler.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 6 +- .../top/GridTopologyCommandHandler.java | 4 +- .../version/GridVersionCommandHandler.java | 2 +- .../tcp/GridTcpMemcachedNioListener.java | 6 +- .../protocols/tcp/GridTcpRestNioListener.java | 6 +- .../service/GridServiceDeploymentFuture.java | 9 +- .../service/GridServiceProcessor.java | 10 +- .../GridStreamerStageExecutionFuture.java | 32 +- .../processors/streamer/IgniteStreamerImpl.java | 23 +- .../internal/util/GridSerializableFuture.java | 28 - .../ignite/internal/util/GridThreadLocal.java | 175 -- .../ignite/internal/util/GridThreadLocalEx.java | 210 --- .../ignite/internal/util/IgniteUtils.java | 19 +- .../util/future/GridCompoundFuture.java | 52 +- .../util/future/GridCompoundIdentityFuture.java | 18 +- .../util/future/GridEmbeddedFuture.java | 77 +- .../util/future/GridFinishedFuture.java | 158 +- .../util/future/GridFinishedFutureEx.java | 197 --- .../internal/util/future/GridFutureAdapter.java | 365 +--- .../util/future/GridFutureAdapterEx.java | 517 ------ .../util/future/GridFutureChainListener.java | 18 +- .../util/future/IgniteFinishedFutureImpl.java | 27 +- .../util/future/IgniteFinishedFutureImplEx.java | 30 - .../internal/util/future/IgniteFutureImpl.java | 31 +- .../internal/util/io/GridFilenameUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 90 +- .../internal/util/lang/GridPlainFuture.java | 79 - .../util/lang/GridPlainFutureAdapter.java | 299 ---- .../util/nio/GridNioEmbeddedFuture.java | 12 +- .../util/nio/GridNioFinishedFuture.java | 77 +- .../ignite/internal/util/nio/GridNioFuture.java | 84 +- .../internal/util/nio/GridNioFutureImpl.java | 282 +-- .../ignite/internal/util/nio/GridNioServer.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 18 +- .../ignite/internal/util/worker/GridWorker.java | 27 - .../internal/util/worker/GridWorkerFuture.java | 20 - .../visor/cache/VisorCacheClearTask.java | 2 +- .../visor/node/VisorGridConfiguration.java | 6 +- .../org/apache/ignite/lang/IgniteFuture.java | 67 +- .../lang/IgniteFutureCancelledException.java | 3 - .../lang/IgniteFutureTimeoutException.java | 3 - .../communication/tcp/TcpCommunicationSpi.java | 32 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../GridTaskFutureImplStopGridSelfTest.java | 2 +- .../internal/GridTaskListenerSelfTest.java | 2 +- .../GridCacheAsyncOperationsLimitSelfTest.java | 3 +- ...dCacheAtomicUsersAffinityMapperSelfTest.java | 7 +- .../GridCacheFinishPartitionsSelfTest.java | 6 +- .../GridCachePartitionedLocalStoreSelfTest.java | 7 - ...chePartitionedOffHeapLocalStoreSelfTest.java | 7 - .../cache/GridCachePutAllFailoverSelfTest.java | 6 +- .../GridCacheReferenceCleanupSelfTest.java | 2 +- .../GridCacheReplicatedLocalStoreSelfTest.java | 7 - ...heReplicatedUsersAffinityMapperSelfTest.java | 7 +- ...ridCacheTxPartitionedLocalStoreSelfTest.java | 7 - .../GridCacheTxUsersAffinityMapperSelfTest.java | 7 +- .../distributed/GridCacheEventAbstractTest.java | 17 +- .../processors/igfs/IgfsAbstractSelfTest.java | 28 +- .../igfs/IgfsDualAbstractSelfTest.java | 18 +- .../cache/GridCacheCommandHandlerSelfTest.java | 42 +- .../util/future/GridCompoundFutureSelfTest.java | 30 +- .../util/future/GridEmbeddedFutureSelfTest.java | 13 +- .../util/future/GridFinishedFutureSelfTest.java | 103 -- .../util/future/GridFutureAdapterSelfTest.java | 115 +- .../future/GridFutureListenPerformanceTest.java | 22 +- .../util/future/IgniteFutureImplTest.java | 99 +- .../util/future/nio/GridNioFutureSelfTest.java | 8 +- .../lang/GridFutureListenPerformanceTest.java | 2 +- .../loadtests/colocation/GridTestMain.java | 2 +- ...GridJobExecutionLoadTestClientSemaphore.java | 2 +- ...JobExecutionSingleNodeSemaphoreLoadTest.java | 2 +- .../mergesort/GridMergeSortLoadTask.java | 2 +- .../ignite/messaging/GridMessagingSelfTest.java | 12 +- .../GridCacheStoreValueBytesTest.java | 4 +- .../testsuites/IgniteLangSelfTestSuite.java | 1 - .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 10 +- .../processors/hadoop/igfs/HadoopIgfsEx.java | 4 +- .../hadoop/igfs/HadoopIgfsFuture.java | 4 +- .../hadoop/igfs/HadoopIgfsInProc.java | 9 +- .../hadoop/igfs/HadoopIgfsInputStream.java | 6 +- .../processors/hadoop/igfs/HadoopIgfsIo.java | 6 +- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 5 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 50 +- .../processors/hadoop/igfs/HadoopIgfsUtils.java | 3 +- .../hadoop/jobtracker/HadoopJobTracker.java | 20 +- .../proto/HadoopProtocolJobStatusTask.java | 2 +- .../hadoop/shuffle/HadoopShuffle.java | 4 +- .../hadoop/shuffle/HadoopShuffleJob.java | 16 +- .../external/HadoopExternalTaskExecutor.java | 28 +- .../child/HadoopChildProcessRunner.java | 10 +- .../HadoopExternalCommunication.java | 7 +- .../HadoopTcpNioCommunicationClient.java | 12 +- .../java/org/apache/ignite/igfs/IgfsLoad.java | 549 ------ .../ignite/loadtests/igfs/IgfsNodeStartup.java | 48 - .../igfs/IgfsPerformanceBenchmark.java | 281 --- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 8 +- .../cache/jta/GridCacheXAResource.java | 9 +- .../processors/schedule/ScheduleFutureImpl.java | 205 +-- .../schedule/GridScheduleSelfTest.java | 4 +- .../ignite/visor/commands/VisorConsole.scala | 61 +- .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 2 - .../visor/commands/ping/VisorPingCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 34 +- .../basic-concepts/async-support.md | 92 + .../basic-concepts/getting-started.md | 235 +++ .../basic-concepts/ignite-life-cycel.md | 122 ++ .../documentation/basic-concepts/maven-setup.md | 85 + .../basic-concepts/what-is-ignite.md | 48 + .../basic-concepts/zero-deployment.md | 73 + wiki/documentation/clustering/aws-config.md | 59 + wiki/documentation/clustering/cluster-config.md | 193 ++ wiki/documentation/clustering/cluster-groups.md | 227 +++ wiki/documentation/clustering/cluster.md | 145 ++ .../documentation/clustering/leader-election.md | 76 + wiki/documentation/clustering/network-config.md | 118 ++ wiki/documentation/clustering/node-local-map.md | 52 + .../documentation/compute-grid/checkpointing.md | 255 +++ .../compute-grid/collocate-compute-and-data.md | 46 + wiki/documentation/compute-grid/compute-grid.md | 73 + .../documentation/compute-grid/compute-tasks.md | 122 ++ .../compute-grid/distributed-closures.md | 124 ++ .../compute-grid/executor-service.md | 40 + .../compute-grid/fault-tolerance.md | 96 + .../compute-grid/job-scheduling.md | 86 + .../compute-grid/load-balancing.md | 76 + .../data-grid/affinity-collocation.md | 95 + .../data-grid/automatic-db-integration.md | 119 ++ wiki/documentation/data-grid/cache-modes.md | 254 +++ wiki/documentation/data-grid/cache-queries.md | 181 ++ wiki/documentation/data-grid/data-grid.md | 85 + wiki/documentation/data-grid/data-loading.md | 94 + wiki/documentation/data-grid/evictions.md | 103 ++ .../data-grid/hibernate-l2-cache.md | 190 ++ wiki/documentation/data-grid/jcache.md | 116 ++ wiki/documentation/data-grid/off-heap-memory.md | 197 +++ .../documentation/data-grid/persistent-store.md | 128 ++ wiki/documentation/data-grid/rebalancing.md | 122 ++ wiki/documentation/data-grid/transactions.md | 144 ++ .../data-grid/web-session-clustering.md | 253 +++ .../distributed-data-structures/atomic-types.md | 114 ++ .../countdownlatch.md | 41 + .../distributed-data-structures/id-generator.md | 57 + .../queue-and-set.md | 133 ++ .../distributed-events/automatic-batching.md | 33 + wiki/documentation/distributed-events/events.md | 118 ++ .../distributed-file-system/igfs.md | 18 + .../distributed-messaging/messaging.md | 90 + wiki/documentation/http/configuration.md | 67 + wiki/documentation/http/rest-api.md | 1663 ++++++++++++++++++ .../release-notes/release-notes.md | 30 + .../service-grid/cluster-singletons.md | 111 ++ .../service-grid/service-configuration.md | 50 + .../service-grid/service-example.md | 111 ++ wiki/documentation/service-grid/service-grid.md | 79 + wiki/licence-prepender.sh | 51 + 347 files changed, 8957 insertions(+), 12864 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index e937757,be6ec07..dfec2d6 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@@ -206,9 -206,9 +206,9 @@@ public class GridDhtPartitionDemandPool if (exchFut != null) { if (log.isDebugEnabled()) - log.debug("Forcing preload event for future: " + exchFut); + log.debug("Forcing rebalance event for future: " + exchFut); - exchFut.listenAsync(new CI1<IgniteInternalFuture<Long>>() { + exchFut.listen(new CI1<IgniteInternalFuture<Long>>() { @Override public void apply(IgniteInternalFuture<Long> t) { cctx.shared().exchange().forcePreloadExchange(exchFut); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index 4d79c09,75a3ddc..f267a78 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@@ -225,12 -226,12 +226,12 @@@ public class GridDhtPreloader<K, V> ext final long start = U.currentTimeMillis(); - if (cctx.config().getPreloadPartitionedDelay() >= 0) { - U.log(log, "Starting preloading in " + cctx.config().getPreloadMode() + " mode: " + cctx.name()); + if (cctx.config().getRebalancePartitionedDelay() >= 0) { + U.log(log, "Starting rebalancing in " + cctx.config().getRebalanceMode() + " mode: " + cctx.name()); - demandPool.syncFuture().listenAsync(new CI1<Object>() { + demandPool.syncFuture().listen(new CI1<Object>() { @Override public void apply(Object t) { - U.log(log, "Completed preloading in " + cctx.config().getPreloadMode() + " mode " + + U.log(log, "Completed rebalancing in " + cctx.config().getRebalanceMode() + " mode " + "[cache=" + cctx.name() + ", time=" + (U.currentTimeMillis() - start) + " ms]"); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6320be9/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ----------------------------------------------------------------------
