Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cde3da44 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cde3da44 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cde3da44 Branch: refs/heads/ignite-5757 Commit: cde3da448e297846e0ae5aca58a8f8f07fc407fc Parents: e5f2d90 23f26af Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Wed Jul 19 12:13:01 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Wed Jul 19 12:13:01 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 20 +++ .../cache/CacheObjectsReleaseFuture.java | 60 +++++++++ .../cache/GridCacheExplicitLockSpan.java | 10 +- .../processors/cache/GridCacheMvccManager.java | 24 +++- .../cache/GridCacheSharedContext.java | 4 +- ...idNearAtomicAbstractSingleUpdateRequest.java | 9 +- ...GridNearAtomicSingleUpdateInvokeRequest.java | 6 + .../atomic/GridNearAtomicUpdateResponse.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 30 +++-- .../cache/transactions/IgniteTxAdapter.java | 44 ++++++- .../cache/transactions/IgniteTxManager.java | 5 +- .../service/GridServiceProcessor.java | 4 +- .../processors/service/ServiceContextImpl.java | 2 + .../util/future/GridCompoundFuture.java | 6 +- .../util/tostring/GridToStringBuilder.java | 2 +- .../spi/IgniteSpiOperationTimeoutHelper.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 131 ++++++++++++------- .../ignite/spi/discovery/tcp/ServerImpl.java | 72 +++++++--- .../spi/discovery/tcp/TcpDiscoverySpi.java | 16 ++- .../IgniteClientReconnectAbstractTest.java | 5 + .../cache/GridCachePutAllFailoverSelfTest.java | 15 +++ .../cache/IgniteCachePutAllRestartTest.java | 15 +++ .../CacheGetInsideLockChangingTopologyTest.java | 5 + .../GridCacheAbstractNodeRestartSelfTest.java | 12 +- ...niteBinaryMetadataUpdateNodeRestartTest.java | 10 ++ .../distributed/IgniteCacheGetRestartTest.java | 5 + .../IgniteCacheNearRestartRollbackSelfTest.java | 15 +++ ...teSynchronizationModesMultithreadedTest.java | 5 + .../IgniteCachePutRetryAbstractSelfTest.java | 5 + .../org/apache/ignite/spi/GridTcpForwarder.java | 26 ++++ .../tcp/TcpCommunicationSpiDropNodesTest.java | 15 +++ .../TcpCommunicationSpiFaultyClientTest.java | 20 ++- .../IgniteCacheRestartTestSuite2.java | 2 + 33 files changed, 494 insertions(+), 116 deletions(-) ----------------------------------------------------------------------
