Merge branches 'ignite-1026' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1026
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe92bfec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe92bfec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe92bfec Branch: refs/heads/ignite-648 Commit: fe92bfec6ee1eaf55df5d1654f51b9b143518a09 Parents: 9adc180 b29ff1c Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Jun 24 15:49:23 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Jun 24 15:49:23 2015 -0700 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../configuration/IgniteReflectionFactory.java | 81 +++- .../ignite/internal/MarshallerContextImpl.java | 12 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheIoManager.java | 64 ++- .../GridCachePartitionExchangeManager.java | 70 ++- .../processors/cache/GridCacheSwapManager.java | 12 +- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 9 +- .../GridDhtPartitionsExchangeFuture.java | 95 +++- .../datastructures/DataStructuresProcessor.java | 64 +-- .../processors/hadoop/HadoopJobInfo.java | 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../offheap/GridOffHeapProcessor.java | 19 +- .../processors/task/GridTaskProcessor.java | 23 +- .../apache/ignite/internal/util/GridDebug.java | 37 +- .../communication/tcp/TcpCommunicationSpi.java | 61 ++- .../tcp/TcpCommunicationSpiMBean.java | 8 + .../ignite/spi/discovery/tcp/ClientImpl.java | 68 ++- .../core/src/main/resources/ignite.properties | 2 +- .../GridTaskFailoverAffinityRunTest.java | 170 +++++++ .../CacheReadThroughAtomicRestartSelfTest.java | 32 ++ ...heReadThroughLocalAtomicRestartSelfTest.java | 32 ++ .../CacheReadThroughLocalRestartSelfTest.java | 32 ++ ...dThroughReplicatedAtomicRestartSelfTest.java | 32 ++ ...cheReadThroughReplicatedRestartSelfTest.java | 32 ++ .../cache/CacheReadThroughRestartSelfTest.java | 133 ++++++ .../GridCacheAbstractFailoverSelfTest.java | 6 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++++ ...eDynamicCacheStartNoExchangeTimeoutTest.java | 466 +++++++++++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 37 ++ ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 22 +- .../IgniteDataStructureWithJobTest.java | 111 +++++ ...ridCachePartitionNotLoadedEventSelfTest.java | 82 ++++ .../distributed/IgniteCache150ClientsTest.java | 189 ++++++++ ...teCacheClientNodePartitionsExchangeTest.java | 1 + .../distributed/IgniteCacheManyClientsTest.java | 2 + .../IgniteCacheTxMessageRecoveryTest.java | 5 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 - ...achePartitionedMultiNodeFullApiSelfTest.java | 49 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 + .../IgniteCacheTxStoreSessionTest.java | 4 + .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../testframework/junits/GridAbstractTest.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite3.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 8 + .../testsuites/IgniteClientTestSuite.java | 38 ++ .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java | 21 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- 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 | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 3 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 23 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 196 ++++++++ ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 3 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 117 files changed, 2759 insertions(+), 683 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe92bfec/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fe92bfec/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ----------------------------------------------------------------------