Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/615bb319 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/615bb319 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/615bb319 Branch: refs/heads/ignite-843-rc1 Commit: 615bb3195881d781b1e07819b5a82f333ddb110a Parents: 36079c2 6ea3b56 Author: Alexey Kuznetsov <[email protected]> Authored: Mon Nov 2 10:29:36 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Nov 2 10:29:36 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 + .../apache/ignite/internal/IgniteKernal.java | 14 +- .../processors/cache/GridCacheProcessor.java | 77 +++-- .../dht/preloader/GridDhtPreloader.java | 4 +- .../CacheObjectPortableProcessorImpl.java | 9 + .../util/nio/GridNioRecoveryDescriptor.java | 11 +- .../communication/tcp/TcpCommunicationSpi.java | 40 ++- .../ignite/spi/discovery/tcp/ClientImpl.java | 205 ++++++++----- .../ignite/spi/discovery/tcp/ServerImpl.java | 213 +++++++++---- .../messages/TcpDiscoveryAbstractMessage.java | 11 + .../messages/TcpDiscoveryNodeAddedMessage.java | 39 +++ .../IgniteClientReconnectCacheTest.java | 33 ++ .../cache/GridCacheAbstractFullApiSelfTest.java | 3 + .../CacheGetFutureHangsSelfTest.java | 8 + .../IgniteCacheClientReconnectTest.java | 2 + .../distributed/IgniteCacheManyClientsTest.java | 14 +- ...gniteClientReconnectMassiveShutdownTest.java | 303 +++++++++++++++++++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 285 +++++++++++++---- 18 files changed, 1021 insertions(+), 253 deletions(-) ----------------------------------------------------------------------
