This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
new 253c41c5a0a Pipe: Fix relative path in SSLConnector trustStorePath is
not formulated & Fix inclusion option 'delete' fails to parse (#13580) (#13616)
253c41c5a0a is described below
commit 253c41c5a0a14c2b7b7810c550773129a3213dc4
Author: Caideyipi <[email protected]>
AuthorDate: Wed Sep 25 15:13:55 2024 +0800
Pipe: Fix relative path in SSLConnector trustStorePath is not formulated &
Fix inclusion option 'delete' fails to parse (#13580) (#13616)
---
.../iotdb/confignode/conf/ConfigNodeConfig.java | 12 +++------
.../protocol/IoTDBConfigRegionConnector.java | 3 ++-
.../client/IoTDBDataNodeSyncClientManager.java | 26 +++++++++----------
.../thrift/sync/IoTDBDataNodeSyncConnector.java | 3 ++-
.../connector/protocol/IoTDBSslSyncConnector.java | 29 +++++++++++-----------
.../options/PipeInclusionOptions.java | 2 +-
6 files changed, 37 insertions(+), 38 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 86bc4e579ed..3689e25a455 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -308,14 +308,10 @@ public class ConfigNodeConfig {
pipeReceiverFileDir = addHomeDir(pipeReceiverFileDir);
}
- private String addHomeDir(String dir) {
- String homeDir = System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME,
null);
- if (!new File(dir).isAbsolute() && homeDir != null && homeDir.length() >
0) {
- if (!homeDir.endsWith(File.separator)) {
- dir = homeDir + File.separatorChar + dir;
- } else {
- dir = homeDir + dir;
- }
+ public static String addHomeDir(String dir) {
+ final String homeDir =
System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME, null);
+ if (!new File(dir).isAbsolute() && homeDir != null && !homeDir.isEmpty()) {
+ dir = !homeDir.endsWith(File.separator) ? homeDir + File.separatorChar +
dir : homeDir + dir;
}
return dir;
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java
index 3e4ca8ac9c5..307151df706 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/protocol/IoTDBConfigRegionConnector.java
@@ -25,6 +25,7 @@ import
org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClient;
import org.apache.iotdb.commons.pipe.connector.client.IoTDBSyncClientManager;
import
org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFilePieceReq;
import org.apache.iotdb.commons.pipe.connector.protocol.IoTDBSslSyncConnector;
+import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
import
org.apache.iotdb.confignode.manager.pipe.connector.client.IoTDBConfigNodeSyncClientManager;
import
org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigPlanReq;
import
org.apache.iotdb.confignode.manager.pipe.connector.payload.PipeTransferConfigSnapshotPieceReq;
@@ -68,7 +69,7 @@ public class IoTDBConfigRegionConnector extends
IoTDBSslSyncConnector {
return new IoTDBConfigNodeSyncClientManager(
nodeUrls,
useSSL,
- trustStorePath,
+ Objects.nonNull(trustStorePath) ?
ConfigNodeConfig.addHomeDir(trustStorePath) : null,
trustStorePwd,
loadBalanceStrategy,
shouldReceiverConvertOnTypeMismatch,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java
index 5a341dc7574..5e4e0fbfcb8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/client/IoTDBDataNodeSyncClientManager.java
@@ -43,14 +43,14 @@ public class IoTDBDataNodeSyncClientManager extends
IoTDBSyncClientManager
LoggerFactory.getLogger(IoTDBDataNodeSyncClientManager.class);
public IoTDBDataNodeSyncClientManager(
- List<TEndPoint> endPoints,
- boolean useSSL,
- String trustStorePath,
- String trustStorePwd,
- boolean useLeaderCache,
- String loadBalanceStrategy,
- boolean shouldReceiverConvertOnTypeMismatch,
- String loadTsFileStrategy) {
+ final List<TEndPoint> endPoints,
+ final boolean useSSL,
+ final String trustStorePath,
+ final String trustStorePwd,
+ final boolean useLeaderCache,
+ final String loadBalanceStrategy,
+ final boolean shouldReceiverConvertOnTypeMismatch,
+ final String loadTsFileStrategy) {
super(
endPoints,
useSSL,
@@ -69,7 +69,7 @@ public class IoTDBDataNodeSyncClientManager extends
IoTDBSyncClientManager
}
@Override
- protected PipeTransferHandshakeV2Req buildHandshakeV2Req(Map<String, String>
params)
+ protected PipeTransferHandshakeV2Req buildHandshakeV2Req(final Map<String,
String> params)
throws IOException {
return PipeTransferDataNodeHandshakeV2Req.toTPipeTransferReq(params);
}
@@ -79,7 +79,7 @@ public class IoTDBDataNodeSyncClientManager extends
IoTDBSyncClientManager
return IoTDBDescriptor.getInstance().getConfig().getClusterId();
}
- public Pair<IoTDBSyncClient, Boolean> getClient(String deviceId) {
+ public Pair<IoTDBSyncClient, Boolean> getClient(final String deviceId) {
final TEndPoint endPoint =
LEADER_CACHE_MANAGER.getLeaderEndPoint(deviceId);
return useLeaderCache
&& endPoint != null
@@ -89,7 +89,7 @@ public class IoTDBDataNodeSyncClientManager extends
IoTDBSyncClientManager
: getClient();
}
- public Pair<IoTDBSyncClient, Boolean> getClient(TEndPoint endPoint) {
+ public Pair<IoTDBSyncClient, Boolean> getClient(final TEndPoint endPoint) {
return useLeaderCache
&& endPoint != null
&& endPoint2ClientAndStatus.containsKey(endPoint)
@@ -98,7 +98,7 @@ public class IoTDBDataNodeSyncClientManager extends
IoTDBSyncClientManager
: getClient();
}
- public void updateLeaderCache(String deviceId, TEndPoint endPoint) {
+ public void updateLeaderCache(final String deviceId, final TEndPoint
endPoint) {
if (!useLeaderCache || deviceId == null || endPoint == null) {
return;
}
@@ -111,7 +111,7 @@ public class IoTDBDataNodeSyncClientManager extends
IoTDBSyncClientManager
}
LEADER_CACHE_MANAGER.updateLeaderEndPoint(deviceId, endPoint);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warn(
"Failed to update leader cache for device {} with endpoint {}:{}.",
deviceId,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
index 294e69a769a..e6f1ac97957 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/thrift/sync/IoTDBDataNodeSyncConnector.java
@@ -43,6 +43,7 @@ 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;
@@ -93,7 +94,7 @@ public abstract class IoTDBDataNodeSyncConnector extends
IoTDBSslSyncConnector {
new IoTDBDataNodeSyncClientManager(
nodeUrls,
useSSL,
- trustStorePath,
+ Objects.nonNull(trustStorePath) ?
IoTDBConfig.addDataHomeDir(trustStorePath) : null,
trustStorePwd,
useLeaderCache,
loadBalanceStrategy,
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java
index a14cfe3e214..6a4dd9e9067 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/protocol/IoTDBSslSyncConnector.java
@@ -65,7 +65,7 @@ public abstract class IoTDBSslSyncConnector extends
IoTDBConnector {
protected IoTDBSyncClientManager clientManager;
@Override
- public void validate(PipeParameterValidator validator) throws Exception {
+ public void validate(final PipeParameterValidator validator) throws
Exception {
super.validate(validator);
final PipeParameters parameters = validator.getParameters();
@@ -90,7 +90,8 @@ public abstract class IoTDBSslSyncConnector extends
IoTDBConnector {
}
@Override
- public void customize(PipeParameters parameters,
PipeConnectorRuntimeConfiguration configuration)
+ public void customize(
+ final PipeParameters parameters, final PipeConnectorRuntimeConfiguration
configuration)
throws Exception {
super.customize(parameters, configuration);
@@ -127,14 +128,14 @@ public abstract class IoTDBSslSyncConnector extends
IoTDBConnector {
}
protected abstract IoTDBSyncClientManager constructClient(
- List<TEndPoint> nodeUrls,
- boolean useSSL,
- String trustStorePath,
- String trustStorePwd,
- boolean useLeaderCache,
- String loadBalanceStrategy,
- boolean shouldReceiverConvertOnTypeMismatch,
- String loadTsFileStrategy);
+ final List<TEndPoint> nodeUrls,
+ final boolean useSSL,
+ final String trustStorePath,
+ final String trustStorePwd,
+ final boolean useLeaderCache,
+ final String loadBalanceStrategy,
+ final boolean shouldReceiverConvertOnTypeMismatch,
+ final String loadTsFileStrategy);
@Override
public void handshake() throws Exception {
@@ -145,7 +146,7 @@ public abstract class IoTDBSslSyncConnector extends
IoTDBConnector {
public void heartbeat() {
try {
handshake();
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warn(
"Failed to reconnect to target server, because: {}. Try to reconnect
later.",
e.getMessage(),
@@ -190,7 +191,7 @@ public abstract class IoTDBSslSyncConnector extends
IoTDBConnector {
resp =
PipeTransferFilePieceResp.fromTPipeTransferResp(
clientAndStatus.getLeft().pipeTransfer(req));
- } catch (Exception e) {
+ } catch (final Exception e) {
clientAndStatus.setRight(false);
throw new PipeConnectionException(
String.format(
@@ -228,10 +229,10 @@ public abstract class IoTDBSslSyncConnector extends
IoTDBConnector {
}
protected abstract PipeTransferFilePieceReq getTransferSingleFilePieceReq(
- String fileName, long position, byte[] payLoad) throws IOException;
+ final String fileName, final long position, final byte[] payLoad) throws
IOException;
protected abstract PipeTransferFilePieceReq getTransferMultiFilePieceReq(
- String fileName, long position, byte[] payLoad) throws IOException;
+ final String fileName, final long position, final byte[] payLoad) throws
IOException;
@Override
public void close() {
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/options/PipeInclusionOptions.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/options/PipeInclusionOptions.java
index 4c96f0ec29d..0c1ffb56224 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/options/PipeInclusionOptions.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/datastructure/options/PipeInclusionOptions.java
@@ -91,7 +91,7 @@ public class PipeInclusionOptions {
Arrays.asList(
"data.delete",
"schema.database.drop",
- "schema.timeseries.ordinary.drop",
+ "schema.timeseries.ordinary.delete",
"schema.timeseries.view.drop",
"schema.timeseries.template.drop",
"schema.timeseries.template.unset",
