This is an automated email from the ASF dual-hosted git repository.
timoninmaxim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c9c611e7b30 IGNITE-26263 Remove orphaned TcpDiscoverySpi#writeToSocket
method (#12286)
c9c611e7b30 is described below
commit c9c611e7b3058f55e694bb4a9628824bc3811e9d
Author: Maksim Timonin <[email protected]>
AuthorDate: Fri Aug 22 18:49:02 2025 +0500
IGNITE-26263 Remove orphaned TcpDiscoverySpi#writeToSocket method (#12286)
---
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 18 ----------
.../IgniteDiscoveryMassiveNodeFailTest.java | 11 ------
.../IgniteTcpCommunicationConnectOnInitTest.java | 14 --------
.../discovery/LongClientConnectToClusterTest.java | 4 +--
.../tcp/TcpDiscoveryCoordinatorFailureTest.java | 18 ----------
.../discovery/tcp/TcpDiscoveryFailedJoinTest.java | 8 -----
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 41 ++++++++++++----------
8 files changed, 26 insertions(+), 90 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 822713bf42d..003701c9add 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -3800,7 +3800,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (latencyCheck && log.isInfoEnabled())
log.info("Latency check message has been
written to socket: " + msg.id());
- spi.writeToSocket(newNextNode ? newNext : next,
+ spi.writeToSocket(
sock,
out,
msg,
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index c4ba9264ebc..97d4c7e0a55 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1761,24 +1761,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter
implements IgniteDiscovery
// No-op, intended for usage in tests.
}
- /**
- * @param node Target node.
- * @param sock Socket.
- * @param out Stream to write to.
- * @param msg Message.
- * @param timeout Timeout.
- * @throws IOException If IO failed or write timed out.
- * @throws IgniteCheckedException If marshalling failed.
- */
- protected void writeToSocket(
- ClusterNode node,
- Socket sock,
- OutputStream out,
- TcpDiscoveryAbstractMessage msg,
- long timeout) throws IOException, IgniteCheckedException {
- writeToSocket(sock, out, msg, timeout);
- }
-
/**
* Writes message to the socket.
*
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
index cbd060d89da..18fa278c8c4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java
@@ -323,17 +323,6 @@ public class IgniteDiscoveryMassiveNodeFailTest extends
GridCommonAbstractTest {
super.writeToSocket(sock, msg, timeout);
}
- /** {@inheritDoc} */
- @Override protected void writeToSocket(ClusterNode node, Socket sock,
OutputStream out,
- TcpDiscoveryAbstractMessage msg, long timeout) throws IOException,
IgniteCheckedException {
- assertNotFailedNode(sock);
-
- if (isDrop(msg))
- return;
-
- super.writeToSocket(node, sock, out, msg, timeout);
- }
-
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, OutputStream out,
TcpDiscoveryAbstractMessage msg,
long timeout) throws IOException, IgniteCheckedException {
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationConnectOnInitTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationConnectOnInitTest.java
index 93f6bc527f0..2e03775bbf7 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationConnectOnInitTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationConnectOnInitTest.java
@@ -27,7 +27,6 @@ import java.util.Collections;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.util.nio.GridNioServer;
@@ -219,19 +218,6 @@ public class IgniteTcpCommunicationConnectOnInitTest
extends GridCommonAbstractT
super.writeToSocket(sock, msg, timeout);
}
- /** {@inheritDoc} */
- @Override protected void writeToSocket(
- ClusterNode node,
- Socket sock,
- OutputStream out,
- TcpDiscoveryAbstractMessage msg,
- long timeout
- ) throws IOException, IgniteCheckedException {
- awaitLatch();
-
- super.writeToSocket(node, sock, out, msg, timeout);
- }
-
/** {@inheritDoc} */
@Override protected void writeToSocket(
Socket sock,
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/LongClientConnectToClusterTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/LongClientConnectToClusterTest.java
index 72c8a3d7390..8b0c912eed5 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/LongClientConnectToClusterTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/LongClientConnectToClusterTest.java
@@ -147,7 +147,7 @@ public class LongClientConnectToClusterTest extends
GridCommonAbstractTest {
public static final int DELAY_MSG_PERIOD_MILLIS = 2_000;
/** {@inheritDoc} */
- @Override protected void writeToSocket(ClusterNode node, Socket sock,
OutputStream out,
+ @Override protected void writeToSocket(Socket sock, OutputStream out,
TcpDiscoveryAbstractMessage msg, long timeout) throws IOException,
IgniteCheckedException {
if (msg instanceof TcpDiscoveryNodeAddFinishedMessage &&
msg.topologyVersion() == 3) {
log.info("Catched discovery message: " + msg);
@@ -162,7 +162,7 @@ public class LongClientConnectToClusterTest extends
GridCommonAbstractTest {
}
}
- super.writeToSocket(node, sock, out, msg, timeout);
+ super.writeToSocket(sock, out, msg, timeout);
}
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryCoordinatorFailureTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryCoordinatorFailureTest.java
index 0b0c68c508d..4a63a0d1b68 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryCoordinatorFailureTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryCoordinatorFailureTest.java
@@ -27,7 +27,6 @@ import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
@@ -317,23 +316,6 @@ public class TcpDiscoveryCoordinatorFailureTest extends
GridCommonAbstractTest {
super.writeToSocket(sock, msg, timeout);
}
- /** {@inheritDoc} */
- @Override protected void writeToSocket(
- ClusterNode node,
- Socket sock,
- OutputStream out,
- TcpDiscoveryAbstractMessage msg,
- long timeout
- ) throws IOException, IgniteCheckedException {
- if (isDrop(msg)) {
- // Replace logic routine message with a stub to update
last-sent-time to avoid segmentation on
- // connRecoveryTimeout.
- msg = new TcpDiscoveryConnectionCheckMessage(locNode);
- }
-
- super.writeToSocket(node, sock, out, msg, timeout);
- }
-
/** {@inheritDoc} */
@Override protected void writeToSocket(
Socket sock,
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryFailedJoinTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryFailedJoinTest.java
index 449df8fc352..8050e781383 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryFailedJoinTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryFailedJoinTest.java
@@ -26,7 +26,6 @@ import java.net.SocketException;
import java.util.Collections;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.query.DummyQueryIndexing;
@@ -206,13 +205,6 @@ public class TcpDiscoveryFailedJoinTest extends
GridCommonAbstractTest {
super.writeToSocket(sock, msg, timeout);
}
- /** {@inheritDoc} */
- @Override protected void writeToSocket(ClusterNode node, Socket sock,
OutputStream out,
- TcpDiscoveryAbstractMessage msg, long timeout) throws IOException,
IgniteCheckedException {
- if (sock.getPort() != FAIL_PORT)
- super.writeToSocket(node, sock, out, msg, timeout);
- }
-
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, OutputStream out,
TcpDiscoveryAbstractMessage msg,
long timeout) throws IOException, IgniteCheckedException {
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 07089a0bde3..c01fc8a5cbc 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -38,6 +38,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
@@ -45,7 +46,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteIllegalStateException;
import org.apache.ignite.Ignition;
-import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.DiscoveryEvent;
@@ -2260,7 +2260,9 @@ public class TcpDiscoverySelfTest extends
GridCommonAbstractTest {
TestRestoreConnectedSpi.startTest = false;
for (int i = 1; i < 5; i++) {
- TestRestoreConnectedSpi spi = new TestRestoreConnectedSpi(3);
+ TestRestoreConnectedSpi spi = new TestRestoreConnectedSpi(() ->
+
discoMap.get(getTestIgniteInstanceName(3)).locNode.discoveryPort()
+ );
spi.setConnectionRecoveryTimeout(0);
@@ -2435,33 +2437,36 @@ public class TcpDiscoverySelfTest extends
GridCommonAbstractTest {
private long sleepEndTime;
/** */
- private long errNodeOrder;
+ private final Supplier<Integer> errPortSupplier;
/** */
- private ClusterNode errNext;
+ private int errNextPort;
- /**
- * @param errNodeOrder
- */
- TestRestoreConnectedSpi(long errNodeOrder) {
- this.errNodeOrder = errNodeOrder;
+ /** */
+ TestRestoreConnectedSpi(Supplier<Integer> errPortSupplier) {
+ this.errPortSupplier = errPortSupplier;
}
/** {@inheritDoc} */
- @Override protected void writeToSocket(ClusterNode node,
+ @Override protected void writeToSocket(
Socket sock,
OutputStream out,
TcpDiscoveryAbstractMessage msg,
long timeout) throws IOException, IgniteCheckedException {
- if (startTest && !(msg instanceof
TcpDiscoveryConnectionCheckMessage)) {
- if (node.order() == errNodeOrder) {
- log.info("Fail write on message send [node=" + node.id() +
", msg=" + msg + ']');
+ // Test relies on an error in this thread only.
+ boolean ringMsgWorkerThread =
Thread.currentThread().getName().startsWith("tcp-disco-msg-worker");
+
+ if (startTest && !(msg instanceof
TcpDiscoveryConnectionCheckMessage) && ringMsgWorkerThread) {
+ int errPort = errPortSupplier.get();
+
+ if (sock.getPort() == errPort) {
+ log.info("Fail write on message send [port=" + errPort +
", msg=" + msg + ']');
throw new SocketTimeoutException();
}
- else if (locNode.order() == errNodeOrder) {
+ else if (locNode.discoveryPort() == errPort) {
if (sleepEndTime == 0) {
- errNext = node;
+ errNextPort = sock.getPort();
sleepEndTime = System.currentTimeMillis() + 3000;
}
@@ -2482,8 +2487,8 @@ public class TcpDiscoverySelfTest extends
GridCommonAbstractTest {
log.info("Stop sleep on message send: " + msg);
- if (node.equals(errNext)) {
- log.info("Fail write after sleep [node=" +
node.id() + ", msg=" + msg + ']');
+ if (sock.getPort() == errNextPort) {
+ log.info("Fail write after sleep [port=" +
sock.getPort() + ", msg=" + msg + ']');
throw new SocketTimeoutException();
}
@@ -2491,7 +2496,7 @@ public class TcpDiscoverySelfTest extends
GridCommonAbstractTest {
}
}
- super.writeToSocket(node, sock, out, msg, timeout);
+ super.writeToSocket(sock, out, msg, timeout);
}
}
