http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index 124ae44..80c45ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java @@ -167,26 +167,26 @@ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridC } switch (writer.state()) { - case 3: + case 4: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 6: - if (!writer.writeMessage("topVer", topVer)) + case 7: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -207,7 +207,7 @@ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridC return false; switch (reader.state()) { - case 3: + case 4: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -215,7 +215,7 @@ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridC reader.incrementState(); - case 4: + case 5: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -223,7 +223,7 @@ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridC reader.incrementState(); - case 5: + case 6: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -231,8 +231,8 @@ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridC reader.incrementState(); - case 6: - topVer = reader.readMessage("topVer"); + case 7: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; @@ -251,7 +251,7 @@ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridC /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 7; + return 8; } /** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index 977e9ba..ab85df3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -213,31 +213,31 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid } switch (writer.state()) { - case 3: + case 4: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeCollection("infos", infos, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeCollection("missedKeys", missedKeys, MessageCollectionItemType.MSG)) return false; @@ -259,7 +259,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid return false; switch (reader.state()) { - case 3: + case 4: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -267,7 +267,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid reader.incrementState(); - case 4: + case 5: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -275,7 +275,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid reader.incrementState(); - case 5: + case 6: infos = reader.readCollection("infos", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -283,7 +283,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid reader.incrementState(); - case 6: + case 7: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -291,7 +291,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid reader.incrementState(); - case 7: + case 8: missedKeys = reader.readCollection("missedKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -311,7 +311,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 8; + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java index 46e9ceb..cd7741b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java @@ -285,49 +285,49 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage } switch (writer.state()) { - case 3: + case 4: if (!writer.writeCollection("historicalParts", historicalParts, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeCollection("parts", parts, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeMap("partsCntrs", partsCntrs, MessageCollectionItemType.INT, MessageCollectionItemType.LONG)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 7: - if (!writer.writeMessage("topVer", topVer)) + case 8: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeByteArray("topicBytes", topicBytes)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeLong("updateSeq", updateSeq)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeInt("workerId", workerId)) return false; @@ -349,7 +349,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage return false; switch (reader.state()) { - case 3: + case 4: historicalParts = reader.readCollection("historicalParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -357,7 +357,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage reader.incrementState(); - case 4: + case 5: parts = reader.readCollection("parts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -365,7 +365,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage reader.incrementState(); - case 5: + case 6: partsCntrs = reader.readMap("partsCntrs", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false); if (!reader.isLastRead()) @@ -373,7 +373,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage reader.incrementState(); - case 6: + case 7: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -381,15 +381,15 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage reader.incrementState(); - case 7: - topVer = reader.readMessage("topVer"); + case 8: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 8: + case 9: topicBytes = reader.readByteArray("topicBytes"); if (!reader.isLastRead()) @@ -397,7 +397,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage reader.incrementState(); - case 9: + case 10: updateSeq = reader.readLong("updateSeq"); if (!reader.isLastRead()) @@ -405,7 +405,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage reader.incrementState(); - case 10: + case 11: workerId = reader.readInt("workerId"); if (!reader.isLastRead()) @@ -415,7 +415,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage } - return reader.afterMessageRead(GridDhtPartitionDemandMessage.class); + return reader.afterMessageRead(GridDhtPartitionDemandLegacyMessage.class); } /** {@inheritDoc} */ @@ -425,7 +425,7 @@ public class GridDhtPartitionDemandLegacyMessage extends GridCacheGroupIdMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 11; + return 12; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index dc6162b..bae3264 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -21,6 +21,7 @@ import java.io.Externalizable; import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridDirectTransient; +import org.apache.ignite.internal.IgniteCodeGeneratingFail; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheGroupIdMessage; import org.apache.ignite.internal.processors.cache.GridCacheMessage; @@ -35,6 +36,7 @@ import org.jetbrains.annotations.NotNull; /** * Partition demand request. */ +@IgniteCodeGeneratingFail public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { /** */ private static final long serialVersionUID = 0L; @@ -259,37 +261,37 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { } switch (writer.state()) { - case 3: + case 4: if (!writer.writeByteArray("partsBytes", partsBytes)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 5: - if (!writer.writeMessage("topVer", topVer)) + case 6: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeByteArray("topicBytes", topicBytes)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeLong("rebalanceId", rebalanceId)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeInt("workerId", workerId)) return false; @@ -311,7 +313,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { return false; switch (reader.state()) { - case 3: + case 4: partsBytes = reader.readByteArray("partsBytes"); if (!reader.isLastRead()) @@ -319,7 +321,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { reader.incrementState(); - case 4: + case 5: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -327,15 +329,15 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { reader.incrementState(); - case 5: - topVer = reader.readMessage("topVer"); + case 6: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 6: + case 7: topicBytes = reader.readByteArray("topicBytes"); if (!reader.isLastRead()) @@ -343,7 +345,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { reader.incrementState(); - case 7: + case 8: rebalanceId = reader.readLong("rebalanceId"); if (!reader.isLastRead()) @@ -351,7 +353,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { reader.incrementState(); - case 8: + case 9: workerId = reader.readInt("workerId"); if (!reader.isLastRead()) @@ -371,7 +373,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 9; + return 10; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index 4d5137e..0352564 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -247,7 +247,7 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa writer.incrementState(); case 2: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -282,7 +282,7 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa reader.incrementState(); case 2: - topVer = reader.readMessage("topVer"); + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; @@ -310,4 +310,4 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa "nodeId", U.id8(nodeId), "evt", U.gridEventName(evt)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java index 284700a..3034fb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java @@ -28,6 +28,7 @@ import java.util.Map; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridDirectCollection; import org.apache.ignite.internal.GridDirectMap; +import org.apache.ignite.internal.IgniteCodeGeneratingFail; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection; import org.apache.ignite.internal.processors.cache.CacheGroupContext; @@ -45,6 +46,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter; /** * Partition supply message. */ +@IgniteCodeGeneratingFail public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage implements GridCacheDeployable { /** */ private static final long serialVersionUID = 0L; @@ -282,55 +284,55 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple } switch (writer.state()) { - case 3: + case 4: if (!writer.writeCollection("clean", clean, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("estimatedKeysCnt", estimatedKeysCnt)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeMap("infos", infos, MessageCollectionItemType.INT, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeMap("keysPerCache", keysPerCache, MessageCollectionItemType.INT, MessageCollectionItemType.LONG)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeMap("last", last, MessageCollectionItemType.INT, MessageCollectionItemType.LONG)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeCollection("missed", missed, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeInt("msgSize", msgSize)) return false; writer.incrementState(); - case 10: - if (!writer.writeMessage("topVer", topVer)) + case 11: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 11: + case 12: // Keep 'updateSeq' name for compatibility. if (!writer.writeLong("updateSeq", rebalanceId)) return false; @@ -353,7 +355,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple return false; switch (reader.state()) { - case 3: + case 4: clean = reader.readCollection("clean", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -361,7 +363,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 4: + case 5: estimatedKeysCnt = reader.readLong("estimatedKeysCnt"); if (!reader.isLastRead()) @@ -369,7 +371,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 5: + case 6: infos = reader.readMap("infos", MessageCollectionItemType.INT, MessageCollectionItemType.MSG, false); if (!reader.isLastRead()) @@ -377,7 +379,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 6: + case 7: keysPerCache = reader.readMap("keysPerCache", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false); if (!reader.isLastRead()) @@ -385,7 +387,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 7: + case 8: last = reader.readMap("last", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false); if (!reader.isLastRead()) @@ -393,7 +395,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 8: + case 9: missed = reader.readCollection("missed", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -401,7 +403,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 9: + case 10: msgSize = reader.readInt("msgSize"); if (!reader.isLastRead()) @@ -409,15 +411,15 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple reader.incrementState(); - case 10: - topVer = reader.readMessage("topVer"); + case 11: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 11: + case 12: // Keep 'updateSeq' name for compatibility. rebalanceId = reader.readLong("updateSeq"); @@ -438,7 +440,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 12; + return 13; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java index b6bff0e..b209cdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java @@ -101,7 +101,7 @@ public class GridDhtPartitionSupplyMessageV2 extends GridDhtPartitionSupplyMessa } switch (writer.state()) { - case 12: + case 13: if (!writer.writeByteArray("errBytes", errBytes)) return false; @@ -123,7 +123,7 @@ public class GridDhtPartitionSupplyMessageV2 extends GridDhtPartitionSupplyMessa return false; switch (reader.state()) { - case 12: + case 13: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -148,6 +148,6 @@ public class GridDhtPartitionSupplyMessageV2 extends GridDhtPartitionSupplyMessa /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 13; + return 14; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index 84cc792..e2884e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -145,7 +145,7 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 5; + return 6; } /** {@inheritDoc} */ @@ -163,19 +163,19 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage } switch (writer.state()) { - case 2: + case 3: if (!writer.writeMessage("exchId", exchId)) return false; writer.incrementState(); - case 3: + case 4: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeMessage("lastVer", lastVer)) return false; @@ -197,7 +197,7 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage return false; switch (reader.state()) { - case 2: + case 3: exchId = reader.readMessage("exchId"); if (!reader.isLastRead()) @@ -205,7 +205,7 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage reader.incrementState(); - case 3: + case 4: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -213,7 +213,7 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage reader.incrementState(); - case 4: + case 5: lastVer = reader.readMessage("lastVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/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 f762d3d..a79c95f 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 @@ -574,6 +574,16 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte return exchActions != null && exchActions.changedBaseline(); } + /** {@inheritDoc} */ + @Override public boolean changedAffinity() { + DiscoveryEvent firstDiscoEvt0 = firstDiscoEvt; + + assert firstDiscoEvt0 != null; + + return firstDiscoEvt0.type() == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT + || !firstDiscoEvt0.eventNode().isClient() || firstDiscoEvt0.eventNode().isLocal(); + } + /** * @return {@code True} if there are caches to start. */ @@ -582,7 +592,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte } /** - * @return First event discovery event. + * @return First event discovery event.1 * */ public DiscoveryEvent firstEvent() { http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 4e895ed..fbaa241 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -633,74 +633,74 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa } switch (writer.state()) { - case 5: + case 6: if (!writer.writeMap("dupPartsData", dupPartsData, MessageCollectionItemType.INT, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeByteArray("errsBytes", errsBytes)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeMap("idealAffDiff", idealAffDiff, MessageCollectionItemType.INT, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeMap("joinedNodeAff", joinedNodeAff, MessageCollectionItemType.INT, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeByteArray("partCntrsBytes", partCntrsBytes)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeByteArray("partCntrsBytes2", partCntrsBytes2)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeByteArray("partHistSuppliersBytes", partHistSuppliersBytes)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeByteArray("partsBytes", partsBytes)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeByteArray("partsSizesBytes", partsSizesBytes)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeByteArray("partsToReloadBytes", partsToReloadBytes)) return false; writer.incrementState(); - case 15: - if (!writer.writeMessage("resTopVer", resTopVer)) + case 16: + if (!writer.writeAffinityTopologyVersion("resTopVer", resTopVer)) return false; writer.incrementState(); - case 16: - if (!writer.writeMessage("topVer", topVer)) + case 17: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); @@ -721,7 +721,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa return false; switch (reader.state()) { - case 5: + case 6: dupPartsData = reader.readMap("dupPartsData", MessageCollectionItemType.INT, MessageCollectionItemType.INT, false); if (!reader.isLastRead()) @@ -729,7 +729,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 6: + case 7: errsBytes = reader.readByteArray("errsBytes"); if (!reader.isLastRead()) @@ -737,7 +737,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 7: + case 8: idealAffDiff = reader.readMap("idealAffDiff", MessageCollectionItemType.INT, MessageCollectionItemType.MSG, false); if (!reader.isLastRead()) @@ -745,7 +745,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 8: + case 9: joinedNodeAff = reader.readMap("joinedNodeAff", MessageCollectionItemType.INT, MessageCollectionItemType.MSG, false); if (!reader.isLastRead()) @@ -753,7 +753,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 9: + case 10: partCntrsBytes = reader.readByteArray("partCntrsBytes"); if (!reader.isLastRead()) @@ -761,7 +761,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 10: + case 11: partCntrsBytes2 = reader.readByteArray("partCntrsBytes2"); if (!reader.isLastRead()) @@ -769,7 +769,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 11: + case 12: partHistSuppliersBytes = reader.readByteArray("partHistSuppliersBytes"); if (!reader.isLastRead()) @@ -777,7 +777,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 12: + case 13: partsBytes = reader.readByteArray("partsBytes"); if (!reader.isLastRead()) @@ -785,7 +785,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 13: + case 14: partsSizesBytes = reader.readByteArray("partsSizesBytes"); if (!reader.isLastRead()) @@ -793,7 +793,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 14: + case 15: partsToReloadBytes = reader.readByteArray("partsToReloadBytes"); if (!reader.isLastRead()) @@ -801,16 +801,16 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa reader.incrementState(); - case 15: - resTopVer = reader.readMessage("resTopVer"); + case 16: + resTopVer = reader.readAffinityTopologyVersion("resTopVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 16: - topVer = reader.readMessage("topVer"); + case 17: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; @@ -829,7 +829,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 17; + return 18; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 088fb31..b5de155 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -473,65 +473,66 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes } switch (writer.state()) { - case 5: + case 6: + if (!writer.writeMessage("activeQryTrackers", activeQryTrackers)) + return false; + + writer.incrementState(); + + case 7: if (!writer.writeBoolean("client", client)) return false; writer.incrementState(); - case 6: + case 8: if (!writer.writeMap("dupPartsData", dupPartsData, MessageCollectionItemType.INT, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 7: + case 9: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 8: + case 10: if (!writer.writeMessage("finishMsg", finishMsg)) return false; writer.incrementState(); - case 9: + case 11: if (!writer.writeCollection("grpsAffRequest", grpsAffRequest, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 10: + case 12: if (!writer.writeByteArray("partCntrsBytes", partCntrsBytes)) return false; writer.incrementState(); - case 11: + case 13: if (!writer.writeByteArray("partHistCntrsBytes", partHistCntrsBytes)) return false; writer.incrementState(); - case 12: + case 14: if (!writer.writeByteArray("partsBytes", partsBytes)) return false; writer.incrementState(); - case 13: + case 15: if (!writer.writeByteArray("partsSizesBytes", partsSizesBytes)) return false; writer.incrementState(); - case 14: - if (!writer.writeMessage("activeQryTrackers", activeQryTrackers)) - return false; - - writer.incrementState(); } return true; @@ -548,7 +549,15 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes return false; switch (reader.state()) { - case 5: + case 6: + activeQryTrackers = reader.readMessage("activeQryTrackers"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 7: client = reader.readBoolean("client"); if (!reader.isLastRead()) @@ -556,7 +565,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 6: + case 8: dupPartsData = reader.readMap("dupPartsData", MessageCollectionItemType.INT, MessageCollectionItemType.INT, false); if (!reader.isLastRead()) @@ -564,7 +573,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 7: + case 9: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -572,7 +581,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 8: + case 10: finishMsg = reader.readMessage("finishMsg"); if (!reader.isLastRead()) @@ -580,7 +589,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 9: + case 11: grpsAffRequest = reader.readCollection("grpsAffRequest", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -588,7 +597,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 10: + case 12: partCntrsBytes = reader.readByteArray("partCntrsBytes"); if (!reader.isLastRead()) @@ -596,7 +605,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 11: + case 13: partHistCntrsBytes = reader.readByteArray("partHistCntrsBytes"); if (!reader.isLastRead()) @@ -604,7 +613,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 12: + case 14: partsBytes = reader.readByteArray("partsBytes"); if (!reader.isLastRead()) @@ -612,7 +621,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 13: + case 15: partsSizesBytes = reader.readByteArray("partsSizesBytes"); if (!reader.isLastRead()) @@ -620,13 +629,6 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes reader.incrementState(); - case 14: - activeQryTrackers = reader.readMessage("activeQryTrackers"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); } return reader.afterMessageRead(GridDhtPartitionsSingleMessage.class); @@ -639,7 +641,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 16; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java index 0be0f37..26d3cde 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java @@ -89,7 +89,7 @@ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMes } switch (writer.state()) { - case 5: + case 6: if (!writer.writeMessage("restoreExchId", restoreExchId)) return false; @@ -111,7 +111,7 @@ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMes return false; switch (reader.state()) { - case 5: + case 6: restoreExchId = reader.readMessage("restoreExchId"); if (!reader.isLastRead()) @@ -131,7 +131,7 @@ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 6; + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java index bad1b61..9c69fdf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java @@ -103,10 +103,11 @@ public class LatchAckMessage implements Message { writer.incrementState(); case 2: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); + } return true; @@ -137,12 +138,13 @@ public class LatchAckMessage implements Message { reader.incrementState(); case 2: - topVer = reader.readMessage("topVer"); + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); + } return reader.afterMessageRead(LatchAckMessage.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java index 45f3282..6418dc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java @@ -313,9 +313,18 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { /** {@inheritDoc} */ @Override public GridDhtTopologyFuture topologyVersionFuture() { - assert topReadyFut != null; + GridDhtTopologyFuture topReadyFut0 = topReadyFut; - return topReadyFut; + assert topReadyFut0 != null; + + if (!topReadyFut0.changedAffinity()) { + GridDhtTopologyFuture lastFut = ctx.exchange().lastFinishedFuture(); + + if (lastFut != null) + return lastFut; + } + + return topReadyFut0; } /** {@inheritDoc} */ @@ -748,45 +757,47 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { long updateSeq = this.updateSeq.incrementAndGet(); - for (int p = 0; p < partitions; p++) { - GridDhtLocalPartition locPart = localPartition0(p, topVer, false, true); - - if (partitionLocalNode(p, topVer)) { - // Prepare partition to rebalance if it's not happened on full map update phase. - if (locPart == null || locPart.state() == RENTING || locPart.state() == EVICTED) - locPart = rebalancePartition(p, false); + if (!ctx.localNode().isClient()) { + for (int p = 0; p < partitions; p++) { + GridDhtLocalPartition locPart = localPartition0(p, topVer, false, true); - GridDhtPartitionState state = locPart.state(); + if (partitionLocalNode(p, topVer)) { + // Prepare partition to rebalance if it's not happened on full map update phase. + if (locPart == null || locPart.state() == RENTING || locPart.state() == EVICTED) + locPart = rebalancePartition(p, false); - if (state == MOVING) { - if (grp.rebalanceEnabled()) { - Collection<ClusterNode> owners = owners(p); + GridDhtPartitionState state = locPart.state(); - // If an owner node left during exchange, then new exchange should be started with detecting lost partitions. - if (!F.isEmpty(owners)) { - if (log.isDebugEnabled()) - log.debug("Will not own partition (there are owners to rebalance from) " + - "[grp=" + grp.cacheOrGroupName() + ", p=" + p + ", owners = " + owners + ']'); + if (state == MOVING) { + if (grp.rebalanceEnabled()) { + Collection<ClusterNode> owners = owners(p); + + // If an owner node left during exchange, then new exchange should be started with detecting lost partitions. + if (!F.isEmpty(owners)) { + if (log.isDebugEnabled()) + log.debug("Will not own partition (there are owners to rebalance from) " + + "[grp=" + grp.cacheOrGroupName() + ", p=" + p + ", owners = " + owners + ']'); + } } + else + updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer); } - else - updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer); } - } - else { - if (locPart != null) { - GridDhtPartitionState state = locPart.state(); + else { + if (locPart != null) { + GridDhtPartitionState state = locPart.state(); - if (state == MOVING) { - locPart.rent(false); + if (state == MOVING) { + locPart.rent(false); - updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer); + updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer); - changed = true; + changed = true; - if (log.isDebugEnabled()) { - log.debug("Evicting " + state + " partition (it does not belong to affinity) [" + - "grp=" + grp.cacheOrGroupName() + ", p=" + locPart.id() + ']'); + if (log.isDebugEnabled()) { + log.debug("Evicting " + state + " partition (it does not belong to affinity) [" + + "grp=" + grp.cacheOrGroupName() + ", p=" + locPart.id() + ']'); + } } } } @@ -1131,25 +1142,38 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { List<ClusterNode> nodes = null; - if (!topVer.equals(diffFromAffinityVer)) { - LT.warn(log, "Requested topology version does not match calculated diff, will require full iteration to" + - "calculate mapping [grp=" + grp.cacheOrGroupName() + ", topVer=" + topVer + - ", diffVer=" + diffFromAffinityVer + "]"); + AffinityTopologyVersion diffVer = diffFromAffinityVer; - nodes = new ArrayList<>(); + if (!diffVer.equals(topVer)) { + LT.warn(log, "Requested topology version does not match calculated diff, need to check if " + + "affinity has changed [grp=" + grp.cacheOrGroupName() + ", topVer=" + topVer + + ", diffVer=" + diffVer + "]"); - nodes.addAll(affNodes); + boolean affChanged; - for (Map.Entry<UUID, GridDhtPartitionMap> entry : node2part.entrySet()) { - GridDhtPartitionState state = entry.getValue().get(p); + if (diffVer.compareTo(topVer) < 0) + affChanged = ctx.exchange().affinityChanged(diffVer, topVer); + else + affChanged = ctx.exchange().affinityChanged(topVer, diffVer); - ClusterNode n = ctx.discovery().node(entry.getKey()); + if (affChanged) { + LT.warn(log, "Requested topology version does not match calculated diff, will require full iteration to" + + "calculate mapping [grp=" + grp.cacheOrGroupName() + ", topVer=" + topVer + + ", diffVer=" + diffVer + "]"); - if (n != null && state != null && (state == MOVING || state == OWNING || state == RENTING) - && !nodes.contains(n) && (topVer.topologyVersion() < 0 || n.order() <= topVer.topologyVersion())) { - nodes.add(n); - } + nodes = new ArrayList<>(); + + nodes.addAll(affNodes); + + for (Map.Entry<UUID, GridDhtPartitionMap> entry : node2part.entrySet()) { + GridDhtPartitionState state = entry.getValue().get(p); + ClusterNode n = ctx.discovery().node(entry.getKey()); + + if (n != null && state != null && (state == MOVING || state == OWNING || state == RENTING) + && !nodes.contains(n) && (topVer.topologyVersion() < 0 || n.order() <= topVer.topologyVersion())) + nodes.add(n); + } } return nodes; http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java index 9670f8a..c19d486 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java @@ -174,4 +174,4 @@ public class CacheVersionedValue implements Message { @Override public String toString() { return S.toString(CacheVersionedValue.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 2531143..247a1f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -375,79 +375,79 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD } switch (writer.state()) { - case 3: + case 4: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("createTtl", createTtl)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeCollection("readersFlags", readersFlags, MessageCollectionItemType.BOOLEAN)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 13: - if (!writer.writeMessage("topVer", topVer)) + case 14: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeString("txLbl", txLbl)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeMessage("ver", ver)) return false; @@ -469,7 +469,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD return false; switch (reader.state()) { - case 3: + case 4: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -477,7 +477,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 4: + case 5: createTtl = reader.readLong("createTtl"); if (!reader.isLastRead()) @@ -485,7 +485,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 5: + case 6: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -493,7 +493,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 6: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -501,7 +501,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 7: + case 8: keys = reader.readCollection("keys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -509,7 +509,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 8: + case 9: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -517,7 +517,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 9: + case 10: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) @@ -525,7 +525,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 10: + case 11: readersFlags = reader.readCollection("readersFlags", MessageCollectionItemType.BOOLEAN); if (!reader.isLastRead()) @@ -533,7 +533,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 11: + case 12: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -541,7 +541,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 12: + case 13: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -549,15 +549,15 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 13: - topVer = reader.readMessage("topVer"); + case 14: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 14: + case 15: txLbl = reader.readString("txLbl"); if (!reader.isLastRead()) @@ -565,7 +565,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD reader.incrementState(); - case 15: + case 16: ver = reader.readMessage("ver"); if (!reader.isLastRead()) @@ -585,7 +585,7 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 16; + return 17; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index b4e4424..578c46b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java @@ -228,43 +228,43 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache } switch (writer.state()) { - case 3: + case 4: if (!writer.writeCollection("entries", entries, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 8: - if (!writer.writeMessage("topVer", topVer)) + case 9: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeMessage("ver", ver)) return false; @@ -286,7 +286,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache return false; switch (reader.state()) { - case 3: + case 4: entries = reader.readCollection("entries", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -294,7 +294,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache reader.incrementState(); - case 4: + case 5: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) @@ -302,7 +302,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache reader.incrementState(); - case 5: + case 6: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -310,7 +310,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache reader.incrementState(); - case 6: + case 7: invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT); if (!reader.isLastRead()) @@ -318,7 +318,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache reader.incrementState(); - case 7: + case 8: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -326,15 +326,15 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache reader.incrementState(); - case 8: - topVer = reader.readMessage("topVer"); + case 9: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 9: + case 10: ver = reader.readMessage("ver"); if (!reader.isLastRead()) @@ -354,7 +354,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 10; + return 11; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index fb7295c..ce913aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -377,61 +377,61 @@ public class GridNearLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 20: + case 21: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 21: + case 22: if (!writer.writeLong("createTtl", createTtl)) return false; writer.incrementState(); - case 22: + case 23: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 23: + case 24: if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 24: + case 25: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 25: + case 26: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 27: + case 28: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 28: - if (!writer.writeMessage("topVer", topVer)) + case 29: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 29: + case 30: if(!writer.writeString("txLbl", txLbl)) return false; @@ -452,7 +452,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 20: + case 21: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -460,7 +460,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 21: + case 22: createTtl = reader.readLong("createTtl"); if (!reader.isLastRead()) @@ -468,7 +468,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 22: + case 23: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -476,7 +476,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 24: filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); if (!reader.isLastRead()) @@ -484,7 +484,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 25: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -492,7 +492,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 25: + case 26: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -500,7 +500,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 26: + case 27: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -508,7 +508,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 27: + case 28: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -516,15 +516,15 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 28: - topVer = reader.readMessage("topVer"); + case 29: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 29: + case 30: txLbl = reader.readString("txLbl"); if(!reader.isLastRead()) @@ -544,7 +544,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 30; + return 31; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index e88f0a0..b6c6d8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java @@ -208,37 +208,37 @@ public class GridNearLockResponse extends GridDistributedLockResponse { } switch (writer.state()) { - case 10: - if (!writer.writeMessage("clientRemapVer", clientRemapVer)) + case 11: + if (!writer.writeAffinityTopologyVersion("clientRemapVer", clientRemapVer)) return false; writer.incrementState(); - case 11: + case 12: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeBooleanArray("filterRes", filterRes)) return false; writer.incrementState(); - case 13: + case 14: if (!writer.writeObjectArray("mappedVers", mappedVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 15: if (!writer.writeInt("miniId", miniId)) return false; writer.incrementState(); - case 15: + case 16: if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG)) return false; @@ -260,15 +260,15 @@ public class GridNearLockResponse extends GridDistributedLockResponse { return false; switch (reader.state()) { - case 10: - clientRemapVer = reader.readMessage("clientRemapVer"); + case 11: + clientRemapVer = reader.readAffinityTopologyVersion("clientRemapVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 11: + case 12: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -276,7 +276,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 12: + case 13: filterRes = reader.readBooleanArray("filterRes"); if (!reader.isLastRead()) @@ -284,7 +284,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 13: + case 14: mappedVers = reader.readObjectArray("mappedVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -292,7 +292,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 14: + case 15: miniId = reader.readInt("miniId"); if (!reader.isLastRead()) @@ -300,7 +300,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { reader.incrementState(); - case 15: + case 16: pending = reader.readCollection("pending", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -320,7 +320,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 16; + return 17; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a63a81a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java index c87e521..3040e5c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java @@ -311,7 +311,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid return false; switch (reader.state()) { - case 3: + case 4: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -319,7 +319,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 4: + case 5: createTtl = reader.readLong("createTtl"); if (!reader.isLastRead()) @@ -327,7 +327,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 5: + case 6: flags = reader.readByte("flags"); if (!reader.isLastRead()) @@ -335,7 +335,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 6: + case 7: futId = reader.readLong("futId"); if (!reader.isLastRead()) @@ -343,7 +343,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 7: + case 8: key = reader.readMessage("key"); if (!reader.isLastRead()) @@ -351,7 +351,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 8: + case 9: mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) @@ -359,7 +359,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 9: + case 10: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -367,7 +367,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 10: + case 11: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -375,15 +375,15 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid reader.incrementState(); - case 11: - topVer = reader.readMessage("topVer"); + case 12: + topVer = reader.readAffinityTopologyVersion("topVer"); if (!reader.isLastRead()) return false; reader.incrementState(); - case 12: + case 13: txLbl = reader.readString("txLbl"); if (!reader.isLastRead()) @@ -411,61 +411,61 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid } switch (writer.state()) { - case 3: + case 4: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 4: + case 5: if (!writer.writeLong("createTtl", createTtl)) return false; writer.incrementState(); - case 5: + case 6: if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); - case 6: + case 7: if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); - case 7: + case 8: if (!writer.writeMessage("key", key)) return false; writer.incrementState(); - case 8: + case 9: if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); - case 9: + case 10: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 10: + case 11: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 11: - if (!writer.writeMessage("topVer", topVer)) + case 12: + if (!writer.writeAffinityTopologyVersion("topVer", topVer)) return false; writer.incrementState(); - case 12: + case 13: if (!writer.writeString("txLbl", txLbl)) return false; @@ -488,7 +488,7 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 13; + return 14; } /** {@inheritDoc} */