ignite git commit: Merge remote-tracking branch 'apache/ignite-5578' into ignite-5872-5578
Repository: ignite Updated Branches: refs/heads/ignite-5872-5578 30339d35c -> 64de3ff31 Merge remote-tracking branch 'apache/ignite-5578' into ignite-5872-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/64de3ff3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/64de3ff3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/64de3ff3 Branch: refs/heads/ignite-5872-5578 Commit: 64de3ff31f22adfb16a678766db9b88a4d903816 Parents: 30339d3 Author: Alexey Goncharuk Authored: Thu Aug 10 17:11:01 2017 +0300 Committer: Alexey Goncharuk Committed: Thu Aug 10 17:11:01 2017 +0300 -- .../dht/preloader/GridDhtPartitionsExchangeFuture.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/64de3ff3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 861ab38..2c9a4bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -2571,7 +2571,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte GridDhtPartitionsSingleMessage res = cctx.exchange().createPartitionsSingleMessage( msg.restoreExchangeId(), cctx.kernalContext().clientNode(), -true); +true, +exchActions); if (localJoinExchange() && finishState0 == null) res.cacheGroupsAffinityRequest(exchCtx.groupsAffinityRequestOnJoin());
ignite git commit: Merge remote-tracking branch 'apache/ignite-5578' into ignite-5872-5578
Repository: ignite Updated Branches: refs/heads/ignite-5872-5578 [created] 30339d35c Merge remote-tracking branch 'apache/ignite-5578' into ignite-5872-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30339d35 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30339d35 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30339d35 Branch: refs/heads/ignite-5872-5578 Commit: 30339d35c9bba365db0369ca8d892efb3a2b3a96 Parents: 855ece3 bc9a416 Author: Alexey Goncharuk Authored: Thu Aug 10 17:09:53 2017 +0300 Committer: Alexey Goncharuk Committed: Thu Aug 10 17:09:53 2017 +0300 -- .../apache/ignite/IgniteSystemProperties.java |3 + .../java/org/apache/ignite/TestDebugLog.java| 219 ++ .../internal/IgniteDiagnosticMessage.java |2 +- .../communication/GridIoMessageFactory.java |9 +- .../internal/managers/discovery/DiscoCache.java | 79 +- .../discovery/GridDiscoveryManager.java | 28 +- .../affinity/AffinityTopologyVersion.java |7 + .../affinity/GridAffinityAssignmentCache.java | 42 + .../affinity/GridAffinityProcessor.java |8 +- .../cache/CacheAffinitySharedManager.java | 688 -- .../processors/cache/CacheGroupContext.java | 18 +- .../cache/CachePartitionExchangeWorkerTask.java |5 +- .../ClientCacheChangeDummyDiscoveryMessage.java |5 + .../cache/ClientCacheUpdateTimeout.java |5 + .../processors/cache/ClusterCachesInfo.java | 22 +- .../processors/cache/ExchangeContext.java | 131 ++ .../cache/ExchangeDiscoveryEvents.java | 262 +++ .../processors/cache/GridCacheAdapter.java |8 +- .../processors/cache/GridCacheContext.java |2 +- .../processors/cache/GridCacheIoManager.java| 57 +- .../processors/cache/GridCacheMapEntry.java |6 +- .../GridCachePartitionExchangeManager.java | 413 +++- .../processors/cache/GridCacheProcessor.java| 14 +- .../dht/ClientCacheDhtTopologyFuture.java | 12 +- .../dht/GridClientPartitionTopology.java| 132 +- .../distributed/dht/GridDhtCacheAdapter.java| 18 +- .../distributed/dht/GridDhtLocalPartition.java |4 +- .../dht/GridDhtPartitionTopology.java | 37 +- .../dht/GridDhtPartitionTopologyImpl.java | 492 +++-- .../dht/GridDhtPartitionsReservation.java |2 +- .../distributed/dht/GridDhtTopologyFuture.java | 36 +- .../dht/GridDhtTransactionalCacheAdapter.java | 95 +- .../dht/GridPartitionedGetFuture.java |4 +- .../dht/GridPartitionedSingleGetFuture.java |4 +- .../GridDhtAtomicAbstractUpdateFuture.java |2 +- .../dht/atomic/GridDhtAtomicCache.java | 31 +- .../GridNearAtomicSingleUpdateFuture.java |1 - .../colocated/GridDhtColocatedLockFuture.java |2 +- .../preloader/CacheGroupAffinityMessage.java| 274 +++ .../preloader/ForceRebalanceExchangeTask.java |5 + .../preloader/GridDhtPartitionExchangeId.java | 11 + .../dht/preloader/GridDhtPartitionMap.java |2 +- .../dht/preloader/GridDhtPartitionSupplier.java |2 +- .../GridDhtPartitionsAbstractMessage.java | 37 +- .../GridDhtPartitionsExchangeFuture.java| 1974 +- .../preloader/GridDhtPartitionsFullMessage.java | 161 +- .../GridDhtPartitionsSingleMessage.java | 78 +- .../GridDhtPartitionsSingleRequest.java | 47 +- .../dht/preloader/GridDhtPreloader.java | 34 +- .../IgniteDhtPartitionCountersMap.java |7 + .../dht/preloader/InitNewCoordinatorFuture.java | 307 +++ .../RebalanceReassignExchangeTask.java |5 + .../distributed/near/GridNearCacheAdapter.java |2 +- .../distributed/near/GridNearGetFuture.java |4 +- .../distributed/near/GridNearLockFuture.java|2 +- ...arOptimisticSerializableTxPrepareFuture.java |1 + .../near/GridNearOptimisticTxPrepareFuture.java |1 + .../GridNearPessimisticTxPrepareFuture.java |1 + .../near/GridNearTxPrepareRequest.java | 14 + .../GridCacheDatabaseSharedManager.java |7 +- .../cache/query/GridCacheQueryAdapter.java |4 +- .../cache/transactions/IgniteTxAdapter.java |2 +- .../cache/transactions/IgniteTxHandler.java | 184 +- .../closure/GridClosureProcessor.java | 36 +- .../cluster/GridClusterStateProcessor.java |2 +- .../datastreamer/DataStreamProcessor.java | 57 +- .../datastreamer/DataStreamerImpl.java | 65 +- .../datastreamer/PlatformDataStreamer.java |3 +- .../query/schema/SchemaExchangeWorkerTask.java |5 + .../SchemaNodeLeaveExchangeWorkerTask.java |5 + .../processors/task/GridTaskWorker.java |8 +- .../org/apache/ignite/thread/IgniteThread.java |
