Skip to content

Pipe: Removed the old useless loopback detection logic #16007

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

Merged
Caideyipi merged 2 commits into from
Jul 23, 2025
+1 −104
Merged

Pipe: Removed the old useless loopback detection logic #16007

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
96d321c
remove-useless
Caideyipi Jul 23, 2025
5fe4865
fix
Caideyipi Jul 23, 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
2 changes: 1 addition & 1 deletion ...test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/basic/IoTDBPipeExtractorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ public void testExtractorTimeRangeMatch() throws Exception {
TestUtils.executeNonQueryWithRetry(receiverEnv, "flush");
};

boolean insertResult = true;
boolean insertResult;

try (final SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
Expand Down
44 changes: 0 additions & 44 deletions ...java/org/apache/iotdb/db/pipe/connector/protocol/airgap/IoTDBDataNodeAirGapConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,66 +19,22 @@

package org.apache.iotdb.db.pipe.connector.protocol.airgap;

import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.commons.pipe.connector.payload.thrift.common.PipeTransferHandshakeConstant;
import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBAirGapConnector;
import org.apache.iotdb.commons.utils.NodeUrlUtils;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req;
import org.apache.iotdb.db.pipe.connector.payload.evolvable.request.PipeTransferDataNodeHandshakeV2Req;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Set;
import java.util.stream.Collectors;

@TreeModel
@TableModel
public abstract class IoTDBDataNodeAirGapConnector extends IoTDBAirGapConnector {

private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataNodeAirGapConnector.class);

@Override
public void validate(final PipeParameterValidator validator) throws Exception {
super.validate(validator);

final PipeConfig pipeConfig = PipeConfig.getInstance();
final Set<TEndPoint> givenNodeUrls = parseNodeUrls(validator.getParameters());

validator.validate(
empty -> {
try {
// Ensure the sink doesn't point to the air gap receiver on DataNode itself
return !(pipeConfig.getPipeAirGapReceiverEnabled()
&& NodeUrlUtils.containsLocalAddress(
givenNodeUrls.stream()
.filter(
tEndPoint ->
tEndPoint.getPort() == pipeConfig.getPipeAirGapReceiverPort())
.map(TEndPoint::getIp)
.collect(Collectors.toList())));
} catch (final UnknownHostException e) {
LOGGER.warn("Unknown host when checking pipe sink IP.", e);
return false;
}
},
String.format(
"One of the endpoints %s of the receivers is pointing back to the air gap receiver %s on sender itself, or unknown host when checking pipe sink IP.",
givenNodeUrls,
new TEndPoint(
IoTDBDescriptor.getInstance().getConfig().getRpcAddress(),
pipeConfig.getPipeAirGapReceiverPort())));
}

@Override
protected boolean mayNeedHandshakeWhenFail() {
return false;
Expand Down
21 changes: 0 additions & 21 deletions ...ain/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
import org.apache.iotdb.commons.utils.NodeUrlUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.connector.payload.legacy.TsFilePipeData;
Expand Down Expand Up @@ -64,14 +63,12 @@
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_IP_KEY;
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE;
Expand Down Expand Up @@ -139,24 +136,6 @@ public void validate(final PipeParameterValidator validator) throws Exception {
parameters.hasAttribute(CONNECTOR_IOTDB_PORT_KEY),
parameters.hasAttribute(SINK_IOTDB_IP_KEY),
parameters.hasAttribute(SINK_IOTDB_PORT_KEY))
.validate(
empty -> {
try {
// Ensure the sink doesn't point to the legacy receiver on DataNode itself
return !NodeUrlUtils.containsLocalAddress(
givenNodeUrls.stream()
.filter(tEndPoint -> tEndPoint.getPort() == ioTDBConfig.getRpcPort())
.map(TEndPoint::getIp)
.collect(Collectors.toList()));
} catch (final UnknownHostException e) {
LOGGER.warn("Unknown host when checking pipe sink IP.", e);
return false;
}
},
String.format(
"One of the endpoints %s of the receivers is pointing back to the legacy receiver %s on sender itself, or unknown host when checking pipe sink IP.",
givenNodeUrls,
new TEndPoint(ioTDBConfig.getRpcAddress(), ioTDBConfig.getRpcPort())))
.validate(
args -> !((boolean) args[0]) || ((boolean) args[1] && (boolean) args[2]),
String.format(
Expand Down
38 changes: 0 additions & 38 deletions ...a/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,58 +22,20 @@
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClientManager;
import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBSslSyncConnector;
import org.apache.iotdb.commons.utils.NodeUrlUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.connector.client.IoTDBDataNodeSyncClientManager;
import org.apache.iotdb.pipe.api.annotation.TableModel;
import org.apache.iotdb.pipe.api.annotation.TreeModel;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.net.UnknownHostException;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

@TreeModel
@TableModel
public abstract class IoTDBDataNodeSyncConnector extends IoTDBSslSyncConnector {

private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDataNodeSyncConnector.class);

protected IoTDBDataNodeSyncClientManager clientManager;

@Override
public void validate(final PipeParameterValidator validator) throws Exception {
super.validate(validator);

final IoTDBConfig iotdbConfig = IoTDBDescriptor.getInstance().getConfig();
final Set<TEndPoint> givenNodeUrls = parseNodeUrls(validator.getParameters());

validator.validate(
empty -> {
try {
// Ensure the sink doesn't point to the thrift receiver on DataNode itself
return !NodeUrlUtils.containsLocalAddress(
givenNodeUrls.stream()
.filter(tEndPoint -> tEndPoint.getPort() == iotdbConfig.getRpcPort())
.map(TEndPoint::getIp)
.collect(Collectors.toList()));
} catch (final UnknownHostException e) {
LOGGER.warn("Unknown host when checking pipe sink IP.", e);
return false;
}
},
String.format(
"One of the endpoints %s of the receivers is pointing back to the thrift receiver %s on sender itself, "
+ "or unknown host when checking pipe sink IP.",
givenNodeUrls, new TEndPoint(iotdbConfig.getRpcAddress(), iotdbConfig.getRpcPort())));
}

@Override
protected IoTDBSyncClientManager constructClient(
final List<TEndPoint> nodeUrls,
Expand Down
Loading