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/6e0f4159 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e0f4159 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e0f4159 Branch: refs/heads/ignite-843 Commit: 6e0f4159358993323bbf5c90fb8d24aa012cc211 Parents: 3a322c0 b08e0b2 Author: Andrey <[email protected]> Authored: Thu Oct 1 16:22:40 2015 +0700 Committer: Andrey <[email protected]> Committed: Thu Oct 1 16:22:40 2015 +0700 ---------------------------------------------------------------------- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 + .../java/org/apache/ignite/igfs/IgfsPath.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 70 +++--- .../discovery/GridDiscoveryManager.java | 22 +- .../processors/cache/GridCacheEventManager.java | 12 +- .../processors/cache/GridCacheIoManager.java | 76 +----- .../processors/cache/GridCacheMessage.java | 7 - .../processors/cache/GridCacheProcessor.java | 68 +++-- .../cache/GridCacheSharedContext.java | 32 --- .../processors/cache/GridCacheUtils.java | 8 - .../dht/GridDhtAffinityAssignmentRequest.java | 5 - .../dht/GridDhtAffinityAssignmentResponse.java | 5 - .../distributed/dht/GridDhtLockRequest.java | 5 - .../distributed/dht/GridDhtTxFinishRequest.java | 5 - .../dht/GridDhtTxPrepareRequest.java | 7 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 - .../dht/preloader/GridDhtForceKeysResponse.java | 5 - .../GridDhtPartitionDemandMessage.java | 5 - .../GridDhtPartitionSupplyMessage.java | 5 - .../GridDhtPartitionsAbstractMessage.java | 5 - .../dht/preloader/GridDhtPreloader.java | 6 + .../internal/processors/igfs/IgfsFileInfo.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 57 +---- .../processors/igfs/IgfsMetaManager.java | 251 +++++++++++++++---- .../util/nio/GridNioRecoveryDescriptor.java | 4 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 2 +- .../IgniteClientReconnectAbstractTest.java | 35 ++- .../IgniteClientReconnectCacheTest.java | 154 ++++++++++++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 + .../GridCacheAbstractFailoverSelfTest.java | 3 + .../GridCacheAbstractRemoveFailureTest.java | 3 + ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 4 + .../cache/IgniteCacheCreateRestartSelfTest.java | 3 + .../IgniteCacheP2pUnmarshallingErrorTest.java | 7 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +- ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 4 + ...artitionedOffHeapValuesQueueApiSelfTest.java | 4 + ...GridCachePartitionedSetFailoverSelfTest.java | 4 + ...acheAsyncOperationsFailoverAbstractTest.java | 11 + .../CachePutAllFailoverAbstractTest.java | 11 + .../IgniteCacheAtomicNodeRestartTest.java | 8 + .../IgniteCachePutGetRestartAbstractTest.java | 3 + .../IgniteCacheSizeFailoverTest.java | 3 + ...gniteAtomicLongChangingTopologySelfTest.java | 29 +-- .../IgniteCacheCrossCacheTxFailoverTest.java | 3 + .../dht/IgniteCrossCacheTxSelfTest.java | 6 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 + .../processors/igfs/IgfsAbstractSelfTest.java | 80 ++++-- .../igfs/IgfsMetaManagerSelfTest.java | 6 - .../processors/igfs/IgfsMetricsSelfTest.java | 2 +- .../processors/igfs/IgfsProcessorSelfTest.java | 29 +-- .../igfs/UniversalFileSystemAdapter.java | 1 - .../processors/hadoop/igfs/HadoopIgfsUtils.java | 36 +++ ...oopFileSystemUniversalFileSystemAdapter.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 7 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 5 +- 56 files changed, 733 insertions(+), 423 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e0f4159/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e0f4159/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------
