Skip to content

IGNITE-27292 : Use MessageSerializer for TcpDiscoveryConnectionCheckMessage #12567

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

Closed
Vladsz83 wants to merge 4 commits into from
Closed

IGNITE-27292 : Use MessageSerializer for TcpDiscoveryConnectionCheckMessage #12567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b7239b
raw
Vladsz83 Dec 9, 2025
eda8def
class cast fix
Vladsz83 Dec 10, 2025
1d4f6b0
Merge branch 'master' into IGNITE-27292-TcpDiscoveryConnectionCheckMe…
Vladsz83 Dec 10, 2025
0f53fc7
merged master
Vladsz83 Dec 10, 2025
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
3 changes: 3 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 @@ -20,13 +20,15 @@
import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer;
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.TcpDiscoveryPingRequestSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer;
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
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.TcpDiscoveryPingRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;

Expand All @@ -39,5 +41,6 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
factory.register((short)2, TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
factory.register((short)3, TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
factory.register((short)4, TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
factory.register((short)5, TcpDiscoveryConnectionCheckMessage::new, new TcpDiscoveryConnectionCheckMessageSerializer());
}
}
6 changes: 4 additions & 2 deletions ...c/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,10 @@ public void addFailedNode(UUID nodeId) {
/**
* @param failedNodes Failed nodes.
*/
public void failedNodes(@Nullable Set<UUID> failedNodes) {
this.failedNodes = failedNodes;
public void failedNodes(@Nullable Collection<UUID> failedNodes) {
this.failedNodes = failedNodes == null
? null
: failedNodes instanceof Set ? (Set<UUID>)failedNodes : new HashSet<>(failedNodes);
}

/**
Expand Down
19 changes: 6 additions & 13 deletions ...java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,22 @@

package org.apache.ignite.spi.discovery.tcp.messages;

import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import org.apache.ignite.internal.managers.discovery.DiscoveryMessageFactory;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;

/**
* Message used to check whether a node is still connected to the topology.
* The difference from {@link TcpDiscoveryStatusCheckMessage} is that this message is sent to the next node
* which directly replies to the sender without message re-translation to the coordinator.
*/
public class TcpDiscoveryConnectionCheckMessage extends TcpDiscoveryAbstractMessage implements Externalizable {
public class TcpDiscoveryConnectionCheckMessage extends TcpDiscoveryAbstractMessage implements Message {
/** */
private static final long serialVersionUID = 0L;

/**
* Default no-arg constructor for {@link Externalizable} interface.
* Default constructor for {@link DiscoveryMessageFactory}.
*/
public TcpDiscoveryConnectionCheckMessage() {
// No-op.
Expand All @@ -55,13 +53,8 @@ public TcpDiscoveryConnectionCheckMessage(TcpDiscoveryNode creatorNode) {
}

/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
// This method has been left empty intentionally to keep message size at min.
}

/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// This method has been left empty intentionally to keep message size at min.
@Override public short directType() {
return 5;
}

/** {@inheritDoc} */
Expand Down