Merge branch 'ignite-sprint-6' into ignite-yardstick-client
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7eb5401 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7eb5401 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7eb5401 Branch: refs/heads/ignite-yardstick-client Commit: a7eb540159a67873a6100f180b22c12e7b63a0ac Parents: 82488e5 1cc0000 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Jun 22 12:04:39 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Jun 22 12:04:39 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 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../processors/cache/GridCacheIoManager.java | 64 ++++--- .../GridCachePartitionExchangeManager.java | 71 ++++--- .../processors/cache/GridCacheSwapManager.java | 12 +- .../processors/cache/GridCacheUtils.java | 9 + .../processors/cache/IgniteCacheProxy.java | 5 + .../continuous/CacheContinuousQueryHandler.java | 8 + .../offheap/GridOffHeapProcessor.java | 19 +- .../processors/query/GridQueryProcessor.java | 7 + .../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 | 113 ++++++++--- .../tcp/TcpCommunicationSpiMBean.java | 11 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 52 +++++- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 48 +++-- .../tcp/internal/TcpDiscoveryNode.java | 18 ++ .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ .../core/src/main/resources/ignite.properties | 2 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../apache/ignite/internal/GridSelfTest.java | 20 +- .../IgniteSlowClientDetectionSelfTest.java | 187 +++++++++++++++++++ .../GridCacheAbstractFailoverSelfTest.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 24 +-- .../IgniteCacheAbstractStopBusySelfTest.java | 30 +-- .../IgniteCacheAtomicStopBusySelfTest.java | 8 +- ...gniteCacheTransactionalStopBusySelfTest.java | 8 +- .../DataStreamerMultiThreadedSelfTest.java | 3 + .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++- .../testframework/GridSpiTestContext.java | 7 +- .../ignite/testsuites/IgniteBasicTestSuite.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 | 2 +- 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 | 179 ++++++++++++++++++ .../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 +- 78 files changed, 1028 insertions(+), 254 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7eb5401/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7eb5401/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7eb5401/modules/yardstick/pom.xml ----------------------------------------------------------------------
