Skip to content

IGNITE-27626 Use MessageSerializer for custom messages #12651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shishkovilja wants to merge 2 commits into
base: master
Choose a base branch
from
Open

IGNITE-27626 Use MessageSerializer for custom messages #12651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20e706c
Chery-pick TcpDiscoveryAbstractTraceableMessage fix
shishkovilja Jan 15, 2026
6ee242b
IGNITE-27626 Use MessageSerializer for TcpDiscoveryCustomEventMessage
shishkovilja Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions ...ore/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions .../src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.ignite.internal.managers.discovery;

import org.apache.ignite.internal.codegen.CacheStatisticsModeChangeMessageSerializer;
import org.apache.ignite.internal.codegen.InetAddressMessageSerializer;
import org.apache.ignite.internal.codegen.InetSocketAddressMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryAuthFailedMessageSerializer;
Expand All @@ -28,17 +29,21 @@
import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryConnectionCheckMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryCustomEventMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryDiscardMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryDuplicateIdMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryHandshakeRequestSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryHandshakeResponseSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryLoopbackProblemMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryMetricsUpdateMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryNodeFullMetricsMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryNodeLeftMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryNodeMetricsMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryRingLatencyCheckMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryServerOnlyCustomEventMessageSerializer;
import org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessage;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessage;
Expand All @@ -52,17 +57,20 @@
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFullMetricsMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeMetricsMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRingLatencyCheckMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryServerOnlyCustomEventMessage;

/** Message factory for discovery messages. */
public class DiscoveryMessageFactory implements MessageFactoryProvider {
Expand Down Expand Up @@ -92,5 +100,12 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
factory.register((short)13, TcpDiscoveryClientMetricsUpdateMessage::new, new TcpDiscoveryClientMetricsUpdateMessageSerializer());
factory.register((short)14, TcpDiscoveryMetricsUpdateMessage::new, new TcpDiscoveryMetricsUpdateMessageSerializer());
factory.register((short)15, TcpDiscoveryClientAckResponse::new, new TcpDiscoveryClientAckResponseSerializer());
factory.register((short)16, TcpDiscoveryNodeLeftMessage::new, new TcpDiscoveryNodeLeftMessageSerializer());

//Custom messages
factory.register((short)500, TcpDiscoveryCustomEventMessage::new, new TcpDiscoveryCustomEventMessageSerializer());
factory.register((short)501, TcpDiscoveryServerOnlyCustomEventMessage::new,
new TcpDiscoveryServerOnlyCustomEventMessageSerializer());
factory.register((short)502, CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer());
}
}
12 changes: 7 additions & 5 deletions ...ore/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@
import org.apache.ignite.spi.discovery.DiscoveryMetricsProvider;
import org.apache.ignite.spi.discovery.DiscoveryNotification;
import org.apache.ignite.spi.discovery.DiscoverySpi;
import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange;
import org.apache.ignite.spi.discovery.DiscoverySpiHistorySupport;
import org.apache.ignite.spi.discovery.DiscoverySpiListener;
Expand Down Expand Up @@ -592,8 +591,11 @@ private void onDiscovery0(DiscoveryNotification notification) {
ClusterNode node = notification.getNode();
long topVer = notification.getTopVer();

DiscoveryCustomMessage customMsg = notification.getCustomMsgData() == null ? null
: ((CustomMessageWrapper)notification.getCustomMsgData()).delegate();
DiscoveryCustomMessage customMsg0 = notification.getCustomMsgData() == null ? null :
notification.getCustomMsgData();

DiscoveryCustomMessage customMsg = customMsg0 instanceof SecurityAwareCustomMessageWrapper ?
((SecurityAwareCustomMessageWrapper)customMsg0).delegate() : customMsg0;

if (skipMessage(notification.type(), customMsg))
return;
Expand Down Expand Up @@ -932,7 +934,7 @@ public SecurityAwareNotificationTask(DiscoveryNotification notification) {

/** */
@Override public void run() {
DiscoverySpiCustomMessage customMsg = notification.getCustomMsgData();
DiscoveryCustomMessage customMsg = notification.getCustomMsgData();

if (customMsg instanceof SecurityAwareCustomMessageWrapper) {
UUID secSubjId = ((SecurityAwareCustomMessageWrapper)customMsg).securitySubjectId();
Expand Down Expand Up @@ -2301,7 +2303,7 @@ public void sendCustomEvent(DiscoveryCustomMessage msg) throws IgniteCheckedExce

getSpi().sendCustomEvent(security.enabled()
? new SecurityAwareCustomMessageWrapper(msg, security.securityContext().subject().id())
: new CustomMessageWrapper(msg));
: msg);
}
catch (IgniteClientDisconnectedException e) {
IgniteFuture<?> reconnectFut = ctx.cluster().clientReconnectFuture();
Expand Down
46 changes: 39 additions & 7 deletions ...java/org/apache/ignite/internal/managers/discovery/SecurityAwareCustomMessageWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,31 @@
package org.apache.ignite.internal.managers.discovery;

import java.util.UUID;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
import org.jetbrains.annotations.Nullable;

/** Extends {@link CustomMessageWrapper} with ID of security subject that initiated the current message. */
public class SecurityAwareCustomMessageWrapper extends CustomMessageWrapper {
/** Custom message wrapper with ID of security subject that initiated the current message. */
public class SecurityAwareCustomMessageWrapper extends DiscoverySpiCustomMessage implements Message {
/** */
private static final long serialVersionUID = 0L;

/** Security subject ID. */
private final UUID secSubjId;
private UUID secSubjId;

/** Original message. */
private DiscoveryCustomMessage delegate;

/**
* Default constructor.
*/
public SecurityAwareCustomMessageWrapper() {
// No-op.
}

/** */
public SecurityAwareCustomMessageWrapper(DiscoveryCustomMessage delegate, UUID secSubjId) {
super(delegate);

this.delegate = delegate;
this.secSubjId = secSubjId;
}

Expand All @@ -42,9 +52,31 @@ public UUID securitySubjectId() {
}

/** {@inheritDoc} */
@Override public @Nullable DiscoverySpiCustomMessage ackMessage() {
DiscoveryCustomMessage ack = delegate().ackMessage();
@Override public boolean isMutable() {
return delegate.isMutable();
}

/** {@inheritDoc} */
@Override public boolean stopProcess() {
return delegate.stopProcess();
}

/**
* @return Delegate.
*/
public DiscoveryCustomMessage delegate() {
return delegate;
}

/** {@inheritDoc} */
@Override public @Nullable DiscoveryCustomMessage ackMessage() {
DiscoveryCustomMessage ack = delegate.ackMessage();

return ack == null ? null : new SecurityAwareCustomMessageWrapper(ack, secSubjId);
}

/** {@inheritDoc} */
@Override public short directType() {
return 500;
}
}
Loading
Loading