Merge master into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/15613e2a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/15613e2a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/15613e2a Branch: refs/heads/ignite-2.1.2-exchange Commit: 15613e2af5e0a4a0014bb5c6d6f6915038b1be1a Parents: d846197 5093660 Author: Alexey Goncharuk <[email protected]> Authored: Tue Jul 4 12:39:38 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Jul 4 12:39:38 2017 +0300 ---------------------------------------------------------------------- .../checkpoint/GridCheckpointManager.java | 2 +- .../managers/communication/GridIoManager.java | 10 +-- .../communication/GridMessageListener.java | 3 +- .../deployment/GridDeploymentCommunication.java | 4 +- .../eventstorage/GridEventStorageManager.java | 4 +- .../processors/cache/GridCacheIoManager.java | 85 +++++++++++--------- .../GridCachePartitionExchangeManager.java | 16 ++-- .../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 ++- 37 files changed, 129 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 44eedb1,49cfcdd..2de3808 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@@ -19,7 -19,7 +19,6 @@@ package org.apache.ignite.internal.proc import java.util.ArrayList; import java.util.Arrays; --import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@@ -80,17 -80,17 +79,12 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; --import org.apache.ignite.internal.util.F0; --import org.apache.ignite.internal.util.GridLeanSet; import org.apache.ignite.internal.util.StripedCompositeReadWriteLock; import org.apache.ignite.internal.util.typedef.CI1; --import org.apache.ignite.internal.util.typedef.F; --import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; --import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; @@@ -355,19 -358,9 +357,19 @@@ public class GridCacheIoManager extend if (log.isDebugEnabled()) log.debug(msg0.toString()); } - else + else { U.error(log, msg0.toString()); + try { + cacheMsg.onClassError(new IgniteCheckedException("Failed to find message handler for message: " + cacheMsg)); + - processFailedMessage(nodeId, cacheMsg, c); ++ processFailedMessage(nodeId, cacheMsg, c, plc); + } + catch (Exception e) { + U.error(log, "Failed to process failed message: " + e, e); + } + } + return; } http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index f07119a,2d1aca0..93310e3 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@@ -863,7 -860,7 +863,7 @@@ public class GridCachePartitionExchange * @param nodes Nodes. */ private void sendAllPartitions(Collection<ClusterNode> nodes) { - GridDhtPartitionsFullMessage m = createPartitionsFullMessage(nodes, null, null, null, null, true); - GridDhtPartitionsFullMessage m = createPartitionsFullMessage(null, null); ++ GridDhtPartitionsFullMessage m = createPartitionsFullMessage(null, null, null, null); if (log.isDebugEnabled()) log.debug("Sending all partitions [nodeIds=" + U.nodeIds(nodes) + ", msg=" + m + ']'); @@@ -886,26 -883,18 +886,24 @@@ } /** - * @param nodes Target nodes. * @param exchId Non-null exchange ID if message is created for exchange. * @param lastVer Last version. - * @param compress {@code True} if it is possible to use compression for message. * @return Message. */ - public GridDhtPartitionsFullMessage createPartitionsFullMessage(Collection<ClusterNode> nodes, + public GridDhtPartitionsFullMessage createPartitionsFullMessage( - final @Nullable GridDhtPartitionExchangeId exchId, - @Nullable GridCacheVersion lastVer) { + @Nullable final GridDhtPartitionExchangeId exchId, + @Nullable GridCacheVersion lastVer, + @Nullable IgniteDhtPartitionHistorySuppliersMap partHistSuppliers, - @Nullable IgniteDhtPartitionsToReloadMap partsToReload, - final boolean compress) { ++ @Nullable IgniteDhtPartitionsToReloadMap partsToReload ++ ) { final GridDhtPartitionsFullMessage m = new GridDhtPartitionsFullMessage(exchId, lastVer, - exchId != null ? exchId.topologyVersion() : AffinityTopologyVersion.NONE); + exchId != null ? exchId.topologyVersion() : AffinityTopologyVersion.NONE, + partHistSuppliers, + partsToReload + ); - m.compress(compress); + m.compress(true); final Map<Object, T2<Integer, GridDhtPartitionFullMap>> dupData = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/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 42f60b1,7471855..a1926ee --- 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 @@@ -1156,12 -1089,8 +1155,10 @@@ public class GridDhtPartitionsExchangeF GridCacheVersion last = lastVer.get(); GridDhtPartitionsFullMessage m = cctx.exchange().createPartitionsFullMessage( - nodes, exchangeId(), - last != null ? last : cctx.versions().last()); + last != null ? last : cctx.versions().last(), + partHistSuppliers, - partsToReload, - compress); ++ partsToReload); if (exchangeOnChangeGlobalState && !F.isEmpty(changeGlobalStateExceptions)) m.setExceptionsMap(changeGlobalStateExceptions); http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/15613e2a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ----------------------------------------------------------------------
