Skip to content

Commit 198d433

Browse files
authored
IGNITE-27332 Use MessageSerializer for TcpDiscoveryLoopbackProblemMessage (#12583)
1 parent 2abe019 commit 198d433

File tree

2 files changed

+34
-3
lines changed

2 files changed

+34
-3
lines changed

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer;
2121
import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer;
2222
import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer;
23+
import org.apache.ignite.internal.codegen.TcpDiscoveryLoopbackProblemMessageSerializer;
2324
import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer;
2425
import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer;
2526
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
2627
import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
2728
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
2829
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
2930
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
31+
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
3032
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
3133
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
3234

@@ -39,5 +41,6 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
3941
factory.register((short)2, TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
4042
factory.register((short)3, TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
4143
factory.register((short)4, TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
44+
factory.register((short)5, TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer());
4245
}
4346
}

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,30 @@
1919

2020
import java.util.Collection;
2121
import java.util.UUID;
22+
import org.apache.ignite.internal.Order;
2223
import org.apache.ignite.internal.util.typedef.internal.S;
24+
import org.apache.ignite.plugin.extensions.communication.Message;
2325

2426
/**
2527
* Message telling joining node that it has loopback problem (misconfiguration).
2628
* This means that remote node is configured to use loopback address, but joining node is not, or vise versa.
2729
*/
28-
public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMessage {
30+
public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMessage implements Message {
2931
/** */
3032
private static final long serialVersionUID = 0L;
3133

3234
/** Remote node addresses. */
33-
private final Collection<String> addrs;
35+
@Order(value = 5, method = "addresses")
36+
private Collection<String> addrs;
3437

3538
/** Remote node host names. */
36-
private final Collection<String> hostNames;
39+
@Order(6)
40+
private Collection<String> hostNames;
41+
42+
/** */
43+
public TcpDiscoveryLoopbackProblemMessage() {
44+
// No-op.
45+
}
3746

3847
/**
3948
* Constructor.
@@ -57,15 +66,34 @@ public Collection<String> addresses() {
5766
return addrs;
5867
}
5968

69+
/**
70+
* @param addrs Remote node addresses.
71+
*/
72+
public void addresses(Collection<String> addrs) {
73+
this.addrs = addrs;
74+
}
75+
6076
/**
6177
* @return Remote node host names.
6278
*/
6379
public Collection<String> hostNames() {
6480
return hostNames;
6581
}
6682

83+
/**
84+
* @param hostNames Remote node host names.
85+
*/
86+
public void hostNames(Collection<String> hostNames) {
87+
this.hostNames = hostNames;
88+
}
89+
6790
/** {@inheritDoc} */
6891
@Override public String toString() {
6992
return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString());
7093
}
94+
95+
/** {@inheritDoc} */
96+
@Override public short directType() {
97+
return 5;
98+
}
7199
}

0 commit comments

Comments
 (0)