Merge remote-tracking branch 'remotes/origin/ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b56b15cd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b56b15cd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b56b15cd Branch: refs/heads/ignite-1168 Commit: b56b15cda7fc94b25400b1334b365053f0017f7f Parents: b3bcf4a 7db44f1 Author: sboikov <sboi...@gridgain.com> Authored: Thu Sep 24 09:09:46 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Sep 24 09:09:46 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java | 18 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 ++- .../continuous/GridContinuousProcessor.java | 3 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java | 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 398 +++++++++++++------ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++--- .../messages/TcpDiscoveryDiscardMessage.java | 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../distributed/CacheAffEarlySelfTest.java | 245 ------------ .../distributed/CacheAffinityEarlyTest.java | 168 ++++++++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++++++ ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++++++++++++++- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../IgniteCacheQuerySelfTestSuite.java | 4 +- 28 files changed, 1099 insertions(+), 525 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b56b15cd/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java ----------------------------------------------------------------------