From 989874d86fd4a0f23866f992eb068285ccc13654 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Tue, 3 Mar 2026 11:02:49 +0300 Subject: [PATCH 1/5] IGNITE-28038 Use MessageSerializer for continuous stop discovery messages --- .../managers/discovery/DiscoveryMessageFactory.java | 6 ++++++ .../continuous/AbstractContinuousMessage.java | 13 +++++++++++-- .../continuous/StopRoutineAckDiscoveryMessage.java | 13 ++++++++++++- .../continuous/StopRoutineDiscoveryMessage.java | 13 ++++++++++++- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java index 221e7708ae047..0aee696442163 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java @@ -23,6 +23,10 @@ import org.apache.ignite.internal.processors.cache.binary.MetadataRemoveAcceptedMessageSerializer; import org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposedMessage; import org.apache.ignite.internal.processors.cache.binary.MetadataRemoveProposedMessageSerializer; +import org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessage; +import org.apache.ignite.internal.processors.continuous.StopRoutineAckDiscoveryMessageSerializer; +import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage; +import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessageSerializer; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; @@ -133,5 +137,7 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider { factory.register((short)501, SecurityAwareCustomMessageWrapper::new, new SecurityAwareCustomMessageWrapperSerializer()); factory.register((short)502, MetadataRemoveAcceptedMessage::new, new MetadataRemoveAcceptedMessageSerializer()); factory.register((short)503, MetadataRemoveProposedMessage::new, new MetadataRemoveProposedMessageSerializer()); + factory.register((short)504, StopRoutineAckDiscoveryMessage::new, new StopRoutineAckDiscoveryMessageSerializer()); + factory.register((short)505, StopRoutineDiscoveryMessage::new, new StopRoutineDiscoveryMessageSerializer()); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java index e9754d12cd966..35330cbe9d267 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; +import org.apache.ignite.internal.Order; import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; @@ -33,15 +34,23 @@ public abstract class AbstractContinuousMessage implements DiscoveryCustomMessag private static final long serialVersionUID = 2781778657738703012L; /** Routine ID. */ - protected final UUID routineId; + @Order(0) + UUID routineId; /** Custom message ID. */ - private final IgniteUuid id = IgniteUuid.randomUuid(); + @Order(1) + IgniteUuid id; + + /** */ + protected AbstractContinuousMessage() { + // No-op. + } /** * @param id Id. */ protected AbstractContinuousMessage(UUID id) { + this.id = IgniteUuid.randomUuid(); routineId = id; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 79d8b29a24081..1d602be6bab00 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -20,15 +20,21 @@ import java.util.UUID; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.extensions.communication.Message; import org.jetbrains.annotations.Nullable; /** * */ -public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage { +public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage implements Message { /** */ private static final long serialVersionUID = 0L; + /** */ + public StopRoutineAckDiscoveryMessage() { + // No-op. + } + /** * @param routineId Routine id. */ @@ -45,4 +51,9 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { @Override public String toString() { return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId()); } + + /** {@inheritDoc} */ + @Override public short directType() { + return 504; + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index f6b18fd1aaa76..92510d873e55b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -20,15 +20,21 @@ import java.util.UUID; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.plugin.extensions.communication.Message; import org.jetbrains.annotations.Nullable; /** * */ -public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage { +public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage implements Message { /** */ private static final long serialVersionUID = 0L; + /** */ + public StopRoutineDiscoveryMessage() { + // No-op. + } + /** * @param routineId Routine id. */ @@ -45,4 +51,9 @@ public StopRoutineDiscoveryMessage(UUID routineId) { @Override public String toString() { return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId()); } + + /** {@inheritDoc} */ + @Override public short directType() { + return 505; + } } From 96f42a4edd75cfcc3a92b083ab1200719c4f427f Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Wed, 4 Mar 2026 17:21:41 +0300 Subject: [PATCH 2/5] IGNITE-28038 Update direct type --- .../processors/continuous/StopRoutineAckDiscoveryMessage.java | 2 +- .../processors/continuous/StopRoutineDiscoveryMessage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 1d602be6bab00..57ef45a745d7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -54,6 +54,6 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { /** {@inheritDoc} */ @Override public short directType() { - return 504; + return 510; } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index 92510d873e55b..7670ed7b96426 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -54,6 +54,6 @@ public StopRoutineDiscoveryMessage(UUID routineId) { /** {@inheritDoc} */ @Override public short directType() { - return 505; + return 511; } } From 5a7b1d3bb99fddff1d7a52ea152fef0897790820 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Wed, 4 Mar 2026 17:26:16 +0300 Subject: [PATCH 3/5] IGNITE-28038 Swap order of assignment fields --- .../processors/continuous/AbstractContinuousMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java index 35330cbe9d267..8c51fa6a8419d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java @@ -50,8 +50,8 @@ protected AbstractContinuousMessage() { * @param id Id. */ protected AbstractContinuousMessage(UUID id) { - this.id = IgniteUuid.randomUuid(); routineId = id; + this.id = IgniteUuid.randomUuid(); } /** {@inheritDoc} */ From 344f299fcaca51d6f7af7031671f56db20fd55a1 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Thu, 5 Mar 2026 14:30:41 +0300 Subject: [PATCH 4/5] IGNITE-28038 Update direct types --- .../processors/continuous/StopRoutineAckDiscoveryMessage.java | 2 +- .../processors/continuous/StopRoutineDiscoveryMessage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 57ef45a745d7d..825c35f8f04bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -54,6 +54,6 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { /** {@inheritDoc} */ @Override public short directType() { - return 510; + return 512; } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index 7670ed7b96426..d0e167fb3aa8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -54,6 +54,6 @@ public StopRoutineDiscoveryMessage(UUID routineId) { /** {@inheritDoc} */ @Override public short directType() { - return 511; + return 513; } } From 8d30bcc6dd5daea91cdbf024bd1b52c44ad1e945 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Fri, 6 Mar 2026 10:30:00 +0300 Subject: [PATCH 5/5] IGNITE-28038 Update direct types --- .../processors/continuous/StopRoutineAckDiscoveryMessage.java | 2 +- .../processors/continuous/StopRoutineDiscoveryMessage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 825c35f8f04bb..3ffd004bbc268 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -54,6 +54,6 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { /** {@inheritDoc} */ @Override public short directType() { - return 512; + return 513; } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index d0e167fb3aa8e..0783793c66156 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -54,6 +54,6 @@ public StopRoutineDiscoveryMessage(UUID routineId) { /** {@inheritDoc} */ @Override public short directType() { - return 513; + return 514; } }