# Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3a54267 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3a54267 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3a54267 Branch: refs/heads/ignite-929 Commit: c3a5426710b6090911d3251852f39b5d96eda4cb Parents: 46c8528 07b6cb5 Author: sboikov <sboi...@gridgain.com> Authored: Fri May 29 15:25:51 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 29 15:25:51 2015 +0300 ---------------------------------------------------------------------- dev-tools/src/main/groovy/jiraslurp.groovy | 36 +- .../main/java/org/apache/ignite/Ignition.java | 17 +- .../org/apache/ignite/cluster/ClusterNode.java | 24 +- .../configuration/CacheConfiguration.java | 27 +- .../configuration/IgniteConfiguration.java | 4 +- .../ignite/internal/ClusterMetricsSnapshot.java | 14 + .../internal/GridEventConsumeHandler.java | 100 +- .../ignite/internal/GridKernalContext.java | 5 + .../ignite/internal/GridKernalContextImpl.java | 5 + .../apache/ignite/internal/IgniteKernal.java | 27 +- .../org/apache/ignite/internal/IgnitionEx.java | 39 +- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../internal/events/DiscoveryCustomEvent.java | 18 +- .../managers/discovery/CustomEventListener.java | 31 + .../discovery/CustomMessageWrapper.java | 63 + .../discovery/DiscoveryCustomMessage.java | 48 + .../discovery/GridDiscoveryManager.java | 212 +- .../affinity/GridAffinityAssignmentCache.java | 32 + .../cache/DynamicCacheChangeBatch.java | 20 +- .../cache/DynamicCacheDescriptor.java | 2 + .../processors/cache/GridCacheAdapter.java | 17 +- .../cache/GridCacheAffinityManager.java | 14 + .../cache/GridCacheConcurrentMap.java | 21 +- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheGateway.java | 2 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 32 +- .../GridCachePartitionExchangeManager.java | 71 +- .../processors/cache/GridCachePreloader.java | 6 +- .../cache/GridCachePreloaderAdapter.java | 11 +- .../processors/cache/GridCacheProcessor.java | 74 +- .../processors/cache/GridCacheProxyImpl.java | 12 + .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheUtils.java | 234 +-- .../processors/cache/IgniteInternalCache.java | 5 + .../cache/affinity/GridCacheAffinityImpl.java | 10 +- .../CacheDataStructuresManager.java | 2 +- .../distributed/GridDistributedTxMapping.java | 17 + .../dht/GridClientPartitionTopology.java | 8 +- .../dht/GridDhtAssignmentFetchFuture.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 27 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 22 +- .../dht/GridDhtTransactionalCacheAdapter.java | 224 ++- .../distributed/dht/GridDhtTxLocalAdapter.java | 8 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 78 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 112 +- .../dht/colocated/GridDhtColocatedCache.java | 12 +- .../colocated/GridDhtColocatedLockFuture.java | 207 +- .../dht/preloader/GridDhtForceKeysFuture.java | 4 +- .../preloader/GridDhtPartitionDemandPool.java | 26 +- .../dht/preloader/GridDhtPartitionMap.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 29 +- .../GridDhtPartitionsExchangeFuture.java | 313 ++- .../preloader/GridDhtPartitionsFullMessage.java | 4 +- .../GridDhtPartitionsSingleMessage.java | 33 +- .../dht/preloader/GridDhtPreloader.java | 28 +- .../preloader/GridDhtPreloaderAssignments.java | 3 +- .../distributed/near/GridNearAtomicCache.java | 5 + .../distributed/near/GridNearCacheAdapter.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 271 ++- .../distributed/near/GridNearLockRequest.java | 68 +- .../distributed/near/GridNearLockResponse.java | 48 +- .../near/GridNearOptimisticTxPrepareFuture.java | 77 +- .../GridNearPessimisticTxPrepareFuture.java | 5 +- .../near/GridNearTransactionalCache.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 43 +- .../near/GridNearTxPrepareRequest.java | 72 +- .../near/GridNearTxPrepareResponse.java | 70 +- .../processors/cache/local/GridLocalCache.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/query/GridCacheQueryErrorFuture.java | 2 + .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 28 +- .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 15 +- .../cache/transactions/IgniteTxHandler.java | 148 +- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../continuous/AbstractContinuousMessage.java | 54 + .../continuous/GridContinuousMessageType.java | 12 - .../continuous/GridContinuousProcessor.java | 836 ++------ .../processors/continuous/StartRequestData.java | 267 +++ .../StartRoutineAckDiscoveryMessage.java | 63 + .../StartRoutineDiscoveryMessage.java | 85 + .../StopRoutineAckDiscoveryMessage.java | 49 + .../continuous/StopRoutineDiscoveryMessage.java | 49 + .../service/GridServiceProcessor.java | 4 +- .../internal/util/future/GridFutureAdapter.java | 4 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/DiscoverySpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java | 40 + .../spi/discovery/DiscoverySpiListener.java | 5 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 1398 +++++++++----- .../tcp/TcpClientDiscoverySpiMBean.java | 8 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 595 +++--- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 119 +- .../tcp/internal/TcpDiscoveryNode.java | 7 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 2 +- .../messages/TcpDiscoveryAbstractMessage.java | 24 +- .../TcpDiscoveryClientHeartbeatMessage.java | 67 + .../messages/TcpDiscoveryClientPingRequest.java | 56 + .../TcpDiscoveryClientPingResponse.java | 67 + .../TcpDiscoveryCustomEventMessage.java | 41 +- .../messages/TcpDiscoveryHeartbeatMessage.java | 28 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 43 + .../messages/TcpDiscoveryNodeAddedMessage.java | 2 +- .../tcp/messages/TcpDiscoveryPingRequest.java | 6 + .../tcp/messages/TcpDiscoveryPingResponse.java | 15 +- .../affinity/IgniteClientNodeAffinityTest.java | 182 ++ .../internal/GridDiscoveryEventSelfTest.java | 7 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 7 +- .../GridProjectionForCachesSelfTest.java | 11 +- .../internal/GridReleaseTypeSelfTest.java | 94 +- .../apache/ignite/internal/GridSelfTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 71 +- .../GridDiscoveryManagerAttributesSelfTest.java | 130 +- .../discovery/GridDiscoveryManagerSelfTest.java | 54 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../GridCacheAbstractRemoveFailureTest.java | 20 + .../cache/GridCacheAbstractSelfTest.java | 2 +- ...acheTcpClientDiscoveryMultiThreadedTest.java | 192 ++ .../GridCacheVariableTopologySelfTest.java | 12 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 29 +- ...gniteCacheP2pUnmarshallingNearErrorTest.java | 13 +- .../IgniteCachePartitionMapUpdateTest.java | 226 +++ .../IgniteDynamicClientCacheStartSelfTest.java | 283 +++ .../cache/IgniteSystemCacheOnClientTest.java | 97 + .../GridCacheQueueApiSelfAbstractTest.java | 4 +- .../IgniteClientDataStructuresAbstractTest.java | 286 +++ .../IgniteClientDataStructuresTest.java | 28 + ...IgniteClientDiscoveryDataStructuresTest.java | 28 + .../GridCacheClientModesAbstractSelfTest.java | 91 +- ...ientModesTcpClientDiscoveryAbstractTest.java | 174 ++ ...niteCacheClientNodeChangingTopologyTest.java | 1803 ++++++++++++++++++ .../IgniteCacheClientNodeConcurrentStart.java | 105 + ...teCacheClientNodePartitionsExchangeTest.java | 632 ++++++ .../dht/GridCacheClientOnlySelfTest.java | 60 +- .../GridCacheDhtClientRemoveFailureTest.java | 28 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 47 +- ...cClientInvalidPartitionHandlingSelfTest.java | 29 + .../GridCacheAtomicClientRemoveFailureTest.java | 28 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 17 +- .../near/GridCacheAtomicNearOnlySelfTest.java | 32 - ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 + .../near/GridCacheNearOnlySelfTest.java | 63 +- .../GridCacheReplicatedClientOnlySelfTest.java | 43 - .../GridCacheReplicatedNearOnlySelfTest.java | 43 - ...heNearOnlyLruNearEvictionPolicySelfTest.java | 19 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 6 +- .../continuous/GridEventConsumeSelfTest.java | 93 +- .../igfs/IgfsClientCacheSelfTest.java | 3 +- .../processors/igfs/IgfsCommonAbstractTest.java | 10 - .../service/GridServiceClientNodeTest.java | 81 + .../OptimizedMarshallerNodeFailoverTest.java | 4 +- ...GridMessagingNoPeerClassLoadingSelfTest.java | 7 +- .../ignite/messaging/GridMessagingSelfTest.java | 13 +- .../discovery/AbstractDiscoverySelfTest.java | 8 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 85 + .../tcp/TcpClientDiscoverySelfTest.java | 700 ------- .../TcpClientDiscoverySpiConfigSelfTest.java | 39 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 1177 ++++++++++++ .../tcp/TcpDiscoveryConcurrentStartTest.java | 61 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + .../ignite/testframework/GridTestUtils.java | 15 + .../testframework/junits/GridAbstractTest.java | 52 +- .../junits/common/GridCommonAbstractTest.java | 59 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteCacheNearOnlySelfTestSuite.java | 16 +- ...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 - ...niteCacheP2pUnmarshallingErrorTestSuite.java | 41 + .../IgniteCacheTcpClientDiscoveryTestSuite.java | 47 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + .../testsuites/IgniteCacheTestSuite2.java | 11 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 7 +- .../IgniteSpiDiscoverySelfTestSuite.java | 4 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 3 +- 186 files changed, 11135 insertions(+), 3772 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a54267/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a54267/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a54267/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3a54267/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ----------------------------------------------------------------------
