Merge branches 'ignite-1168' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/66b91b9a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/66b91b9a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/66b91b9a Branch: refs/heads/ignite-843 Commit: 66b91b9af6fcfe04a6de2874b375d8f7c51ec693 Parents: 124c492 e5c3ca3 Author: Andrey <anovi...@gridgain.com> Authored: Tue Sep 29 09:23:49 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Sep 29 09:23:49 2015 +0700 ---------------------------------------------------------------------- bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- examples/schema-import/pom.xml | 10 +- .../computegrid/ComputeClosureExample.java | 2 +- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 2 +- .../cache/DynamicCacheChangeRequest.java | 19 + .../cache/DynamicCacheDescriptor.java | 29 +- .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheProcessor.java | 33 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../near/GridNearTxFinishFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 19 +- .../continuous/CacheContinuousQueryHandler.java | 10 +- .../continuous/CacheContinuousQueryManager.java | 66 ++- .../transactions/IgniteTxLocalAdapter.java | 35 +- .../continuous/GridContinuousProcessor.java | 20 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../internal/processors/igfs/IgfsImpl.java | 87 +--- .../processors/igfs/IgfsMetaManager.java | 193 ++++++++- .../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 +- .../internal/GridUpdateNotifierSelfTest.java | 1 + .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 3 +- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++++++ .../IgniteTxExceptionAbstractSelfTest.java | 3 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 +- ...nedQueueFailoverDataConsistencySelfTest.java | 5 - .../distributed/CacheAffEarlySelfTest.java | 245 ------------ .../distributed/CacheAffinityEarlyTest.java | 168 ++++++++ .../IgniteTxPreloadAbstractTest.java | 43 +- .../GridCacheColocatedTxExceptionSelfTest.java | 5 - ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/GridCacheNearTxExceptionSelfTest.java | 5 - .../near/NearCacheMultithreadedUpdateTest.java | 217 ++++++++++ .../GridCacheReplicatedInvalidateSelfTest.java | 249 ------------ .../GridCacheReplicatedTxExceptionSelfTest.java | 5 - .../replicated/GridReplicatedTxPreloadTest.java | 2 - ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../GridCacheLocalTxExceptionSelfTest.java | 5 - ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++++++ .../processors/igfs/IgfsAbstractSelfTest.java | 201 +++++++--- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++--- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++++++++++++++- .../multijvm/IgniteCacheProcessProxy.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 28 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 12 + .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- pom.xml | 27 +- 72 files changed, 2121 insertions(+), 1123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/66b91b9a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------