IGNITE-884 - Merged from master
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56c20e99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56c20e99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56c20e99 Branch: refs/heads/ignite-884 Commit: 56c20e99c119cef99c2fcb85376c06439f53a480 Parents: 5a3c88a f0d24f6 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Jul 17 12:06:47 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Jul 17 12:06:47 2015 -0700 ---------------------------------------------------------------------- DEVNOTES.txt | 8 + RELEASE_NOTES.txt | 14 + assembly/LICENSE_FABRIC | 306 +++++ assembly/LICENSE_HADOOP | 259 ++++ assembly/NOTICE_FABRIC | 13 + assembly/NOTICE_HADOOP | 12 + assembly/dependencies-fabric.xml | 14 + assembly/dependencies-hadoop.xml | 12 + assembly/dependencies-visor-console.xml | 20 +- assembly/release-base.xml | 10 - assembly/release-fabric.xml | 12 + assembly/release-hadoop.xml | 12 + bin/ignite.bat | 8 +- bin/ignite.sh | 6 +- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 + dev-tools/slurp.sh | 2 +- examples/pom.xml | 2 +- .../examples/ScalarCacheAffinityExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 2 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- modules/aop/licenses/aspectj-epl-license.txt | 69 - modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 48 + .../src/main/resources/META-INF/licenses.txt.vm | 42 + modules/aws/pom.xml | 2 +- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +- .../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +- modules/clients/pom.xml | 2 +- .../ClientAbstractConnectivitySelfTest.java | 4 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/licenses/jsr166-license.txt | 3 + modules/core/licenses/snaptree-bsd-license.txt | 2 +- modules/core/pom.xml | 13 +- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 19 +- .../IgniteClientDisconnectedException.java | 61 + .../java/org/apache/ignite/IgniteCluster.java | 8 + .../apache/ignite/IgniteSystemProperties.java | 6 + .../org/apache/ignite/cache/CacheManager.java | 13 +- .../apache/ignite/cache/CacheTypeMetadata.java | 53 +- .../affinity/fair/FairAffinityFunction.java | 5 +- .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 - .../cache/eviction/lru/LruEvictionPolicy.java | 5 - .../eviction/sorted/SortedEvictionPolicy.java | 19 +- .../org/apache/ignite/cluster/ClusterGroup.java | 18 +- .../org/apache/ignite/cluster/ClusterNode.java | 2 + .../configuration/CacheConfiguration.java | 111 +- .../configuration/IgniteReflectionFactory.java | 81 +- .../configuration/NearCacheConfiguration.java | 10 +- .../configuration/TransactionConfiguration.java | 23 + .../apache/ignite/internal/GridComponent.java | 18 + .../ignite/internal/GridJobSiblingImpl.java | 2 +- .../ignite/internal/GridKernalContext.java | 5 + .../ignite/internal/GridKernalContextImpl.java | 36 +- .../ignite/internal/GridKernalGateway.java | 46 +- .../ignite/internal/GridKernalGatewayImpl.java | 85 +- .../apache/ignite/internal/GridKernalState.java | 3 + .../ignite/internal/GridPluginComponent.java | 11 + ...gniteClientDisconnectedCheckedException.java | 49 + .../apache/ignite/internal/IgniteKernal.java | 269 ++-- .../ignite/internal/MarshallerContextImpl.java | 12 +- .../internal/cluster/ClusterGroupAdapter.java | 50 +- .../cluster/IgniteClusterAsyncImpl.java | 17 +- .../internal/cluster/IgniteClusterImpl.java | 18 + .../internal/interop/InteropIgnition.java | 48 +- .../internal/interop/InteropProcessor.java | 7 + .../internal/managers/GridManagerAdapter.java | 27 +- .../managers/communication/GridIoManager.java | 173 ++- .../managers/communication/GridIoMessage.java | 15 +- .../managers/communication/GridIoPolicy.java | 32 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../deployment/GridDeploymentManager.java | 95 +- .../discovery/GridDiscoveryManager.java | 257 +++- .../eventstorage/GridEventStorageManager.java | 2 +- .../processors/GridProcessorAdapter.java | 11 + .../affinity/AffinityTopologyVersion.java | 7 - .../affinity/GridAffinityAssignmentCache.java | 26 +- .../processors/cache/CacheObjectImpl.java | 1 - .../processors/cache/CacheOperationContext.java | 44 +- .../cache/CacheOsConflictResolutionManager.java | 6 + .../internal/processors/cache/CacheType.java | 8 +- .../cache/DynamicCacheChangeBatch.java | 17 + .../cache/DynamicCacheChangeRequest.java | 39 +- .../processors/cache/GridCacheAdapter.java | 116 +- .../cache/GridCacheAffinityManager.java | 21 +- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheAttributes.java | 3 + .../cache/GridCacheConcurrentMap.java | 15 +- .../processors/cache/GridCacheContext.java | 69 +- .../cache/GridCacheDeploymentManager.java | 10 +- .../processors/cache/GridCacheGateway.java | 120 +- .../processors/cache/GridCacheIoManager.java | 82 +- .../processors/cache/GridCacheManager.java | 6 + .../cache/GridCacheManagerAdapter.java | 6 + .../processors/cache/GridCacheMvccManager.java | 51 +- .../GridCachePartitionExchangeManager.java | 215 +++- .../processors/cache/GridCachePreloader.java | 5 + .../cache/GridCachePreloaderAdapter.java | 5 + .../processors/cache/GridCacheProcessor.java | 583 ++++++--- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../cache/GridCacheSharedContext.java | 120 +- .../cache/GridCacheSharedManager.java | 11 +- .../cache/GridCacheSharedManagerAdapter.java | 20 +- .../processors/cache/GridCacheSwapManager.java | 261 ++-- .../processors/cache/GridCacheUtils.java | 62 + .../processors/cache/IgniteCacheFutureImpl.java | 53 + .../processors/cache/IgniteCacheProxy.java | 534 +++++--- .../CacheDataStructuresManager.java | 35 + .../distributed/GridCacheTxFinishSync.java | 46 + .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtCacheAdapter.java | 14 +- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../distributed/dht/GridDhtLocalPartition.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 28 +- .../dht/GridDhtPartitionsReservation.java | 292 +++++ .../distributed/dht/GridDhtTopologyFuture.java | 14 - .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../dht/GridPartitionedGetFuture.java | 26 +- .../cache/distributed/dht/GridReservable.java | 35 + .../dht/atomic/GridDhtAtomicCache.java | 33 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 202 ++- .../dht/preloader/GridDhtPartitionMap.java | 26 +- .../GridDhtPartitionsExchangeFuture.java | 156 ++- .../dht/preloader/GridDhtPreloader.java | 16 +- .../distributed/near/GridNearCacheAdapter.java | 8 + .../distributed/near/GridNearGetFuture.java | 17 +- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/dr/GridOsCacheDrManager.java | 7 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 22 + .../cache/query/GridCacheQueryAdapter.java | 46 +- .../query/GridCacheQueryFutureAdapter.java | 2 +- .../cache/query/GridCacheQueryManager.java | 33 - .../cache/query/GridCacheTwoStepQuery.java | 22 +- .../continuous/CacheContinuousQueryHandler.java | 17 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../transactions/IgniteTransactionsImpl.java | 59 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../cache/transactions/IgniteTxManager.java | 23 +- .../transactions/TransactionProxyImpl.java | 2 +- .../cache/version/GridCacheVersionManager.java | 9 +- .../processors/clock/GridClockServer.java | 21 +- .../clock/GridClockSyncProcessor.java | 6 +- .../processors/cluster/ClusterProcessor.java | 11 + .../continuous/GridContinuousHandler.java | 9 +- .../continuous/GridContinuousProcessor.java | 127 +- .../datastreamer/DataStreamProcessor.java | 27 +- .../datastreamer/DataStreamerImpl.java | 90 +- .../datastructures/DataStructuresProcessor.java | 136 +- .../datastructures/GridCacheAtomicLongImpl.java | 58 +- .../GridCacheAtomicReferenceImpl.java | 34 +- .../GridCacheAtomicSequenceImpl.java | 44 +- .../GridCacheAtomicStampedImpl.java | 54 +- .../GridCacheCountDownLatchImpl.java | 82 +- .../datastructures/GridCacheRemovable.java | 6 +- .../datastructures/GridCacheSetImpl.java | 15 +- .../datastructures/GridCacheSetProxy.java | 47 +- .../processors/hadoop/HadoopJobInfo.java | 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../processors/job/GridJobProcessor.java | 2 +- .../internal/processors/job/GridJobWorker.java | 2 +- .../offheap/GridOffHeapProcessor.java | 19 +- .../processors/plugin/CachePluginManager.java | 10 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../processors/query/GridQueryIndexing.java | 13 +- .../processors/query/GridQueryProcessor.java | 36 +- .../messages/GridQueryNextPageResponse.java | 34 +- .../h2/twostep/messages/GridQueryRequest.java | 111 +- .../processors/rest/GridRestProcessor.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 12 +- .../service/GridServiceProcessor.java | 45 +- .../processors/service/GridServiceProxy.java | 13 +- .../processors/task/GridTaskProcessor.java | 78 +- .../processors/task/GridTaskWorker.java | 63 +- .../internal/util/GridConfigurationFinder.java | 55 +- .../apache/ignite/internal/util/GridDebug.java | 48 +- .../ignite/internal/util/IgniteUtils.java | 34 +- .../util/future/GridFutureChainListener.java | 4 - .../internal/util/future/IgniteFutureImpl.java | 30 +- .../shmem/IpcSharedMemoryClientEndpoint.java | 5 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../ignite/internal/util/lang/GridFunc.java | 2 + .../util/nio/GridNioMessageTracker.java | 23 +- .../ignite/internal/util/nio/GridNioServer.java | 64 +- .../apache/ignite/internal/visor/VisorJob.java | 2 + .../visor/cache/VisorCacheConfiguration.java | 11 - .../visor/cache/VisorCacheStopTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 + .../visor/query/VisorQueryCleanupTask.java | 14 + .../util/VisorClusterGroupEmptyException.java | 37 + .../plugin/extensions/communication/IoPool.java | 42 + .../plugin/security/SecuritySubjectType.java | 3 +- .../java/org/apache/ignite/spi/IgniteSpi.java | 15 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 498 ++++++-- .../tcp/TcpCommunicationSpiMBean.java | 19 + .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../spi/discovery/DiscoverySpiDataExchange.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 626 ++++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 369 +++++- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 84 +- .../tcp/internal/TcpDiscoveryNode.java | 47 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 76 +- .../messages/TcpDiscoveryAbstractMessage.java | 3 + .../messages/TcpDiscoveryClientAckResponse.java | 64 + .../messages/TcpDiscoveryHandshakeResponse.java | 14 + .../messages/TcpDiscoveryNodeFailedMessage.java | 18 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 3 +- .../startup/cmdline/CommandLineTransformer.java | 9 + .../META-INF/classnames-jdk.properties | 3 + .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/spark/spark-config.xml | 46 + modules/core/src/test/config/tests.properties | 6 +- .../affinity/IgniteClientNodeAffinityTest.java | 14 +- .../IgniteFairAffinityDynamicCacheSelfTest.java | 3 +- ...cheStoreSessionListenerAbstractSelfTest.java | 112 +- .../internal/ClusterGroupAbstractTest.java | 777 +++++++++++ .../internal/ClusterGroupHostsSelfTest.java | 141 ++ .../ignite/internal/ClusterGroupSelfTest.java | 251 ++++ .../internal/GridDiscoveryEventSelfTest.java | 12 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../internal/GridProjectionAbstractTest.java | 784 ------------ .../ignite/internal/GridProjectionSelfTest.java | 251 ---- .../apache/ignite/internal/GridSelfTest.java | 22 +- .../GridTaskFailoverAffinityRunTest.java | 170 +++ .../internal/GridUpdateNotifierSelfTest.java | 15 +- .../IgniteClientReconnectAbstractTest.java | 363 ++++++ .../IgniteClientReconnectApiExceptionTest.java | 846 ++++++++++++ .../IgniteClientReconnectAtomicsTest.java | 672 ++++++++++ .../IgniteClientReconnectCacheTest.java | 1202 ++++++++++++++++++ .../IgniteClientReconnectCollectionsTest.java | 443 +++++++ .../IgniteClientReconnectComputeTest.java | 192 +++ ...eClientReconnectContinuousProcessorTest.java | 372 ++++++ ...IgniteClientReconnectDiscoveryStateTest.java | 123 ++ ...niteClientReconnectFailoverAbstractTest.java | 231 ++++ .../IgniteClientReconnectFailoverTest.java | 212 +++ .../IgniteClientReconnectServicesTest.java | 260 ++++ .../internal/IgniteClientReconnectStopTest.java | 106 ++ .../IgniteClientReconnectStreamerTest.java | 233 ++++ .../IgniteSlowClientDetectionSelfTest.java | 188 +++ .../communication/GridIoManagerSelfTest.java | 2 +- .../GridDeploymentManagerStopSelfTest.java | 7 + .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++ .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 34 +- .../cache/CacheFutureExceptionSelfTest.java | 158 +++ .../CacheMetricsForClusterGroupSelfTest.java | 10 +- .../cache/CacheOffheapMapEntrySelfTest.java | 7 +- .../CacheReadThroughAtomicRestartSelfTest.java | 32 + ...heReadThroughLocalAtomicRestartSelfTest.java | 32 + .../CacheReadThroughLocalRestartSelfTest.java | 32 + ...dThroughReplicatedAtomicRestartSelfTest.java | 32 + ...cheReadThroughReplicatedRestartSelfTest.java | 32 + .../cache/CacheReadThroughRestartSelfTest.java | 133 ++ .../cache/CacheStopAndDestroySelfTest.java | 859 +++++++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 379 ++++-- .../cache/GridCacheAbstractSelfTest.java | 16 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 2 +- .../IgniteCacheAbstractStopBusySelfTest.java | 32 +- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- .../IgniteCacheConfigurationTemplateTest.java | 26 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 6 +- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 19 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++ ...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 193 +-- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../IgniteTxExceptionAbstractSelfTest.java | 1 + ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 22 +- .../IgniteClientDataStructuresAbstractTest.java | 109 +- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- .../IgniteDataStructureWithJobTest.java | 111 ++ .../GridCacheAbstractNodeRestartSelfTest.java | 12 +- ...ridCachePartitionNotLoadedEventSelfTest.java | 82 ++ .../distributed/IgniteCache150ClientsTest.java | 190 +++ ...teCacheClientNodePartitionsExchangeTest.java | 30 +- .../IgniteCacheClientReconnectTest.java | 175 +++ .../distributed/IgniteCacheManyClientsTest.java | 2 + .../IgniteCacheServerNodeConcurrentStart.java | 96 ++ .../IgniteCacheSystemTransactionsSelfTest.java | 2 +- .../IgniteCacheTxMessageRecoveryTest.java | 5 + .../IgniteCachePutRetryAbstractSelfTest.java | 147 +++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 + ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 7 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 10 +- .../GridCachePartitionedFailoverSelfTest.java | 5 + ...achePartitionedMultiNodeFullApiSelfTest.java | 99 +- .../GridCachePartitionedNodeRestartTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- .../GridCacheReplicatedInvalidateSelfTest.java | 3 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 5 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 4 +- ...heConcurrentEvictionConsistencySelfTest.java | 15 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../IgniteCacheTxStoreSessionTest.java | 4 + ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 2 +- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...AtomicClientOnlyMultiJvmFullApiSelfTest.java | 31 + ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 31 + ...omicFairAffinityMultiJvmFullApiSelfTest.java | 31 + .../GridCacheAtomicMultiJvmFullApiSelfTest.java | 30 + ...tomicMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 31 + ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java | 31 + ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 31 + ...derOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java | 30 + ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 31 + ...onedFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...CachePartitionedMultiJvmFullApiSelfTest.java | 30 + ...ionedMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...onedNearDisabledMultiJvmFullApiSelfTest.java | 31 + ...abledMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...rDisabledOffHeapMultiJvmFullApiSelfTest.java | 31 + ...ledOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...rtitionedOffHeapMultiJvmFullApiSelfTest.java | 31 + ...nedOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...ReplicatedAtomicMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...dCacheReplicatedMultiJvmFullApiSelfTest.java | 30 + ...catedMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...plicatedNearOnlyMultiJvmFullApiSelfTest.java | 37 + ...eplicatedOffHeapMultiJvmFullApiSelfTest.java | 31 + ...tedOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + .../DataStreamerMultiThreadedSelfTest.java | 3 + .../DataStreamerMultinodeCreateCacheTest.java | 14 +- .../internal/util/IgniteUtilsSelfTest.java | 22 + .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 827 +++++++++++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 118 +- .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 +- .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../GridCommandLineTransformerSelfTest.java | 12 +- .../testframework/GridSpiTestContext.java | 7 +- .../testframework/junits/GridAbstractTest.java | 387 +++++- .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 58 +- .../junits/multijvm/AffinityProcessProxy.java | 195 +++ .../multijvm/IgniteCacheProcessProxy.java | 602 +++++++++ .../multijvm/IgniteClusterProcessProxy.java | 325 +++++ .../multijvm/IgniteEventsProcessProxy.java | 148 +++ .../junits/multijvm/IgniteNodeRunner.java | 184 +++ .../junits/multijvm/IgniteProcessProxy.java | 571 +++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 8 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 3 + ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 89 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../testsuites/IgniteCacheTestSuite2.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 10 +- .../testsuites/IgniteClientNodesTestSuite.java | 42 + .../IgniteClientReconnectTestSuite.java | 48 + .../testsuites/IgniteClientTestSuite.java | 38 + .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../ignite/util/TestTcpCommunicationSpi.java | 21 + modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/readme.txt | 6 - modules/docker/Dockerfile | 55 + modules/docker/README.txt | 11 + modules/docker/build_users_libs.sh | 39 + modules/docker/download_ignite.sh | 49 + modules/docker/execute.sh | 62 + modules/docker/run.sh | 34 + modules/extdata/p2p/pom.xml | 4 +- .../p2p/GridP2PContinuousDeploymentTask1.java | 2 +- .../CacheConfigurationP2PTestClient.java | 4 +- modules/extdata/uri/META-INF/ignite.xml | 38 + .../extdata/uri/modules/uri-dependency/pom.xml | 40 + .../deployment/uri/tasks/GarHelloWorldBean.java | 60 + .../src/main/resources/gar-example.properties | 18 + modules/extdata/uri/pom.xml | 50 +- .../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++ .../deployment/uri/tasks/gar-spring-bean.xml | 29 + modules/gce/pom.xml | 2 +- .../geospatial/licenses/jts-lgpl-license.txt | 165 --- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 80 +- .../fs/IgniteHadoopFileSystemCounterWriter.java | 9 +- .../processors/hadoop/HadoopClassLoader.java | 29 + .../processors/hadoop/HadoopDefaultJobInfo.java | 27 +- .../internal/processors/hadoop/HadoopUtils.java | 237 ---- .../hadoop/SecondaryFileSystemProvider.java | 3 +- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 241 ++++ .../hadoop/fs/HadoopFileSystemsUtils.java | 11 + .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 + .../hadoop/jobtracker/HadoopJobTracker.java | 25 +- .../child/HadoopChildProcessRunner.java | 3 +- .../processors/hadoop/v2/HadoopV2Job.java | 84 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 22 +- .../hadoop/v2/HadoopV2TaskContext.java | 37 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 5 +- .../processors/hadoop/HadoopMapReduceTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java | 7 +- .../processors/hadoop/HadoopTasksV2Test.java | 7 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 4 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- .../licenses/hibernate-lgpl-2.1-license.txt | 174 --- modules/hibernate/pom.xml | 2 +- .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - modules/indexing/licenses/h2-epl-license.txt | 69 - modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 84 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 49 +- .../query/h2/twostep/GridMapQueryExecutor.java | 321 ++++- .../query/h2/twostep/GridMergeIndex.java | 62 +- .../h2/twostep/GridMergeIndexUnsorted.java | 7 +- .../h2/twostep/GridReduceQueryExecutor.java | 708 +++++++++-- .../query/h2/twostep/GridResultPage.java | 21 +- .../CacheAbstractQueryMetricsSelfTest.java | 157 ++- .../cache/CacheLocalQueryMetricsSelfTest.java | 33 + ...titionedQueryMetricsDistributedSelfTest.java | 33 + ...chePartitionedQueryMetricsLocalSelfTest.java | 33 + .../CachePartitionedQueryMetricsSelfTest.java | 32 - ...plicatedQueryMetricsDistributedSelfTest.java | 33 + ...acheReplicatedQueryMetricsLocalSelfTest.java | 33 + .../CacheReplicatedQueryMetricsSelfTest.java | 32 - .../cache/GridCacheCrossCacheQuerySelfTest.java | 3 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 196 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 5 +- ...ClientReconnectCacheQueriesFailoverTest.java | 225 ++++ .../cache/IgniteClientReconnectQueriesTest.java | 427 +++++++ ...lientQueryReplicatedNodeRestartSelfTest.java | 419 ++++++ .../IgniteCacheQueryNodeRestartSelfTest.java | 36 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 388 ++++++ ...dCacheAbstractReduceFieldsQuerySelfTest.java | 4 + .../IgniteCacheQuerySelfTestSuite.java | 12 +- .../IgniteCacheWithIndexingTestSuite.java | 1 + modules/jcl/pom.xml | 2 +- modules/jta/licenses/jta-license.txt | 2 + modules/jta/pom.xml | 2 +- .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 +- .../cache/jta/GridCacheXAResource.java | 34 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +- .../GridTmLookupLifecycleAwareSelfTest.java | 29 +- modules/kafka/licenses/apache-2.0.txt | 202 +++ modules/kafka/pom.xml | 105 ++ .../ignite/stream/kafka/KafkaStreamer.java | 220 ++++ .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 + .../stream/kafka/KafkaEmbeddedBroker.java | 378 ++++++ .../kafka/KafkaIgniteStreamerSelfTest.java | 227 ++++ .../ignite/stream/kafka/SimplePartitioner.java | 53 + modules/log4j/pom.xml | 2 +- modules/mesos/licenses/jetty-epl-license.txt | 69 - modules/mesos/pom.xml | 4 +- .../apache/ignite/mesos/ClusterProperties.java | 14 + .../apache/ignite/mesos/IgniteScheduler.java | 26 +- modules/rest-http/pom.xml | 20 +- .../scalar-2.10/licenses/scala-bsd-license.txt | 18 - modules/scalar-2.10/pom.xml | 2 +- modules/scalar/licenses/scala-bsd-license.txt | 18 - modules/scalar/pom.xml | 2 +- .../licenses/cron4j-lgpl-2.1-license.txt | 174 --- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- modules/slf4j/licenses/sl4j-mit-license.txt | 21 - modules/slf4j/pom.xml | 2 +- .../spark-2.10/licenses/scala-bsd-license.txt | 18 - modules/spark-2.10/pom.xml | 2 +- modules/spark/licenses/scala-bsd-license.txt | 18 - modules/spark/pom.xml | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 +- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 + modules/spring/pom.xml | 2 +- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 22 +- .../util/spring/IgniteSpringHelperImpl.java | 72 +- .../IgniteExcludeInConfigurationTest.java | 81 ++ .../org/apache/ignite/spring/sprint-exclude.xml | 76 ++ .../testsuites/IgniteSpringTestSuite.java | 2 + modules/ssh/licenses/jcraft-revised-bsd.txt | 28 - modules/ssh/pom.xml | 2 +- modules/tools/licenses/jodd-revised-bsd.txt | 21 - modules/tools/pom.xml | 2 +- .../urideploy/licenses/jtidy-mit-license.txt | 50 - modules/urideploy/pom.xml | 16 +- .../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +- .../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- modules/visor-console-2.10/pom.xml | 2 +- .../licenses/jline-bsd-license.txt | 18 - .../licenses/scala-bsd-license.txt | 18 - modules/visor-console/pom.xml | 2 +- .../ignite/visor/commands/VisorConsole.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 9 +- .../visor/commands/open/VisorOpenCommand.scala | 319 +++++ .../scala/org/apache/ignite/visor/visor.scala | 230 +--- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 + .../commands/kill/VisorKillCommandSpec.scala | 1 + .../commands/start/VisorStartCommandSpec.scala | 1 + .../commands/tasks/VisorTasksCommandSpec.scala | 1 + .../commands/vvm/VisorVvmCommandSpec.scala | 1 + .../licenses/slf4j-mit-license.txt | 21 - modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 12 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- .../config/benchmark-put-indexed-val.properties | 64 + modules/yardstick/config/ignite-base-config.xml | 23 + modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutIndexedValue1Benchmark.java | 42 + .../cache/IgnitePutIndexedValue2Benchmark.java | 42 + .../cache/IgnitePutIndexedValue8Benchmark.java | 42 + .../ignite/yardstick/cache/model/Person1.java | 55 + .../ignite/yardstick/cache/model/Person2.java | 67 + .../ignite/yardstick/cache/model/Person8.java | 109 ++ modules/yarn/README.txt | 28 + modules/yarn/licenses/apache-2.0.txt | 202 +++ modules/yarn/pom.xml | 101 ++ .../apache/ignite/yarn/ApplicationMaster.java | 400 ++++++ .../apache/ignite/yarn/ClusterProperties.java | 432 +++++++ .../org/apache/ignite/yarn/IgniteContainer.java | 84 ++ .../org/apache/ignite/yarn/IgniteProvider.java | 339 +++++ .../apache/ignite/yarn/IgniteYarnClient.java | 178 +++ .../org/apache/ignite/yarn/package-info.java | 22 + .../ignite/yarn/utils/IgniteYarnUtils.java | 81 ++ .../main/resources/ignite-default-config.xml | 35 + .../org/apache/ignite/IgniteYarnTestSuite.java | 38 + .../yarn/IgniteApplicationMasterSelfTest.java | 532 ++++++++ parent/pom.xml | 96 ++ pom.xml | 20 +- scripts/git-patch-prop.sh | 2 +- 580 files changed, 32975 insertions(+), 5918 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56c20e99/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java index cfe61c7,7af1572..9bdebb3 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java @@@ -224,19 -218,19 +221,33 @@@ public class DynamicCacheChangeRequest } /** + * @return Close flag. + */ + public boolean close() { + return close; + } + + /** + * @param close New close flag. + */ + public void close(boolean close) { + this.close = close; + } + ++ /** + * @return Start context. + */ + public CacheStartContext startContext() { + return startCtx; + } + + /** + * @param startCtx Start context. + */ + public void startContext(CacheStartContext startCtx) { + this.startCtx = startCtx; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(DynamicCacheChangeRequest.class, this, "cacheName", cacheName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56c20e99/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56c20e99/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 441f0f2,bda0485..e559cfb --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@@ -1616,6 -1750,8 +1766,8 @@@ public class GridCacheProcessor extend GridCachePartitionExchangeManager exchMgr = new GridCachePartitionExchangeManager(); GridCacheIoManager ioMgr = new GridCacheIoManager(); + CacheJtaManagerAdapter jta = JTA.createOptional(); - ++ return new GridCacheSharedContext( kernalCtx, tm, @@@ -2026,10 -2217,8 +2245,10 @@@ DynamicCacheStartFuture fut = new DynamicCacheStartFuture(req.cacheName(), req.deploymentId(), req); try { + String masked = maskNull(req.cacheName()); + - if (req.stop()) { + if (req.stop() || req.close()) { - DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName())); + DynamicCacheDescriptor desc = registeredCaches.get(masked); if (desc == null) // No-op. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56c20e99/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index d7a6c31,bd2623d..9c67aee --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@@ -1682,40 -1713,43 +1703,81 @@@ public class GridCacheUtils } /** + * @param c Closure to retry. + * @param <S> Closure type. + * @return Wrapped closure. + */ + public static <S> Callable<S> retryTopologySafe(final Callable<S> c ) { + return new Callable<S>() { + @Override public S call() throws Exception { + int retries = GridCacheAdapter.MAX_RETRIES; + + IgniteCheckedException err = null; + + for (int i = 0; i < retries; i++) { + try { + return c.call(); + } + catch (IgniteCheckedException e) { + if (X.hasCause(e, ClusterTopologyCheckedException.class) || + X.hasCause(e, IgniteTxRollbackCheckedException.class) || + X.hasCause(e, CachePartialUpdateCheckedException.class)) { + if (i < retries - 1) { + err = e; + + U.sleep(1); + + continue; + } + + throw e; + } + else + throw e; + } + } + + // Should never happen. + throw err; + } + }; + } ++ ++ /** + * @param ctx Context. + * @param factory Factory. + * @return Object. + */ + @Nullable public static <T> T create(GridKernalContext ctx, @Nullable Factory<T> factory) { + assert ctx != null; + + T obj = factory != null ? factory.create() : null; + + ctx.resource().autowireSpringBean(obj); + + return obj; + } + + /** + * @param ctx Context. + * @param factories Factories. + * @return Objects. + */ + @Nullable public static <T> Collection<T> create(GridKernalContext ctx, @Nullable Factory[] factories) { + assert ctx != null; + + if (factories == null) + return null; + + Collection<T> col = new ArrayList<>(factories.length); + + for (Factory<T> factory : factories) { + T obj = create(ctx, factory); + + if (obj != null) + col.add(obj); + } + + return col; + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56c20e99/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java index efeb8f4,9a883b3..0f37a37 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java @@@ -55,9 -55,9 +55,10 @@@ public class GridCacheTestContext<K, V new GridCacheDeploymentManager<K, V>(), new GridCachePartitionExchangeManager<K, V>(), new GridCacheIoManager(), + new CacheNoopJtaManager(), null ), + new CacheStartContext(ctx, defaultCacheConfiguration()), defaultCacheConfiguration(), CacheType.USER, true, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56c20e99/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java ----------------------------------------------------------------------
