Merge remote-tracking branch 'remotes/community/ignite-2.1' into ignite-gg-12389
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87cb2ae6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87cb2ae6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87cb2ae6 Branch: refs/heads/ignite-gg-12389 Commit: 87cb2ae604fb722892c3383cf1b70966c0f3f16e Parents: 5788649 15613e2 Author: sboikov <[email protected]> Authored: Tue Jul 4 17:11:48 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Jul 4 17:11:48 2017 +0300 ---------------------------------------------------------------------- .../checkpoint/GridCheckpointManager.java | 2 +- .../managers/communication/GridIoManager.java | 10 +-- .../communication/GridMessageListener.java | 3 +- .../deployment/GridDeploymentCommunication.java | 4 +- .../eventstorage/GridEventStorageManager.java | 4 +- .../affinity/GridAffinityAssignmentCache.java | 8 +- .../processors/cache/GridCacheIoManager.java | 79 +++++++++++--------- .../GridCachePartitionExchangeManager.java | 24 +++--- .../cache/binary/BinaryMetadataTransport.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 11 +-- .../cache/transactions/IgniteTxManager.java | 2 +- .../processors/cluster/ClusterProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 4 +- .../datastreamer/DataStreamProcessor.java | 2 +- .../datastreamer/DataStreamerImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../igfs/IgfsFragmentizerManager.java | 4 +- .../processors/job/GridJobProcessor.java | 8 +- .../GridMarshallerMappingProcessor.java | 4 +- .../processors/query/GridQueryProcessor.java | 2 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../processors/task/GridTaskProcessor.java | 6 +- .../jobstealing/JobStealingCollisionSpi.java | 2 +- ...idCommunicationManagerListenersSelfTest.java | 2 +- .../GridCommunicationSendMessageSelfTest.java | 2 +- .../cache/GridCachePartitionedGetSelfTest.java | 2 +- ...lerCacheClientRequestsMappingOnMissTest.java | 6 +- ...naryObjectMetadataExchangeMultinodeTest.java | 6 +- ...DeadlockDetectionMessageMarshallingTest.java | 2 +- .../communication/GridIoManagerBenchmark.java | 4 +- .../communication/GridIoManagerBenchmark0.java | 12 +-- .../communication/GridCacheMessageSelfTest.java | 2 +- .../testframework/GridSpiTestContext.java | 5 +- .../hadoop/shuffle/HadoopShuffle.java | 2 +- .../query/h2/opt/GridH2IndexBase.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 12 ++- .../generator/ConfigurationGenerator.js | 9 ++- 39 files changed, 148 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/87cb2ae6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/87cb2ae6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/87cb2ae6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index c9182ec,a1926ee..d2761cb --- 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 @@@ -1269,12 -1158,10 +1268,10 @@@ public class GridDhtPartitionsExchangeF exchangeId(), last != null ? last : cctx.versions().last(), partHistSuppliers, - partsToReload, - compress); + partsToReload); - if (exchangeOnChangeGlobalState && !F.isEmpty(changeGlobalStateExceptions)) - m.setExceptionsMap(changeGlobalStateExceptions); + if (stateChangeExchange() && !F.isEmpty(changeGlobalStateExceptions)) + m.setErrorsMap(changeGlobalStateExceptions); return m; } http://git-wip-us.apache.org/repos/asf/ignite/blob/87cb2ae6/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/87cb2ae6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/87cb2ae6/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ----------------------------------------------------------------------
