Merge branch 'ignite-sprint-7' into ignite-917
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9946b2ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9946b2ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9946b2ae Branch: refs/heads/ignite-917 Commit: 9946b2aed52dc78fd3d726a7b1c53e0d7f502c11 Parents: c5096c0 3b49184 Author: ashutak <ashu...@gridgain.com> Authored: Tue Jun 23 14:28:44 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Tue Jun 23 14:28:44 2015 +0300 ---------------------------------------------------------------------- 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 + .../ignite/internal/MarshallerContextImpl.java | 12 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../processors/cache/GridCacheIoManager.java | 64 +++-- .../GridCachePartitionExchangeManager.java | 71 +++--- .../processors/cache/GridCacheSwapManager.java | 12 +- .../GridDhtPartitionsExchangeFuture.java | 49 +++- .../continuous/CacheContinuousQueryHandler.java | 8 + .../processors/hadoop/HadoopJobInfo.java | 4 +- .../hadoop/counter/HadoopCounterWriter.java | 5 +- .../offheap/GridOffHeapProcessor.java | 19 +- .../apache/ignite/internal/util/GridDebug.java | 37 ++- .../ignite/internal/util/nio/GridNioServer.java | 64 ++++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 104 +++++++- .../tcp/TcpCommunicationSpiMBean.java | 19 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 80 +++++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 17 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ .../core/src/main/resources/ignite.properties | 2 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../IgniteSlowClientDetectionSelfTest.java | 187 +++++++++++++++ .../GridCacheAbstractFailoverSelfTest.java | 6 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ++++++++++ .../GridCacheReplicatedFailoverSelfTest.java | 5 + .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 +++- .../testframework/GridSpiTestContext.java | 7 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 + 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/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 +++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 1 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- .../cache/jta/GridCacheXAResource.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 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 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 98 files changed, 1364 insertions(+), 599 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9946b2ae/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ----------------------------------------------------------------------
