Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de27ff1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de27ff1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de27ff1b Branch: refs/heads/master Commit: de27ff1b8788b622937b17bfeaf8941242914d1a Parents: bcfbb92 415264e Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Jun 22 09:21:46 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Jun 22 09:21:46 2015 +0300 ---------------------------------------------------------------------- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../GridCachePartitionExchangeManager.java | 1 + .../continuous/CacheContinuousQueryHandler.java | 8 + .../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 | 71 +++++++ .../tcp/TcpCommunicationSpiMBean.java | 11 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 17 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../IgniteSlowClientDetectionSelfTest.java | 187 +++++++++++++++++++ .../testframework/GridSpiTestContext.java | 7 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../cache/jta/GridCacheXAResource.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 2 +- 21 files changed, 467 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
