This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 453cd46c26b Pipe: Fixed the bug that the relative path in
OPCUAConnector security dir is not formulated (#13555)
453cd46c26b is described below
commit 453cd46c26bb884c0c1abcd27ee0279f0da1983d
Author: Caideyipi <[email protected]>
AuthorDate: Fri Sep 20 17:47:15 2024 +0800
Pipe: Fixed the bug that the relative path in OPCUAConnector security dir
is not formulated (#13555)
---
.../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../db/pipe/connector/protocol/opcua/OpcUaConnector.java | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index cee1a707ad8..d0885bfca3c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -1436,7 +1436,7 @@ public class IoTDBConfig {
// if IOTDB_DATA_HOME is not set, then we keep dataHomeDir prefix being the
same with IOTDB_HOME
// In this way, we can keep consistent with v0.13.0~2.
- private String addDataHomeDir(String dir) {
+ public static String addDataHomeDir(final String dir) {
String dataHomeDir = System.getProperty(IoTDBConstant.IOTDB_DATA_HOME,
null);
if (dataHomeDir == null) {
dataHomeDir = System.getProperty(IoTDBConstant.IOTDB_HOME, null);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java
index 02d2017ba11..9ab7a110a6f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaConnector.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.pipe.connector.protocol.opcua;
+import org.apache.iotdb.db.conf.IoTDBConfig;
import
org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import
org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.pipe.api.PipeConnector;
@@ -119,13 +120,14 @@ public class OpcUaConnector implements PipeConnector {
Arrays.asList(CONNECTOR_IOTDB_PASSWORD_KEY,
SINK_IOTDB_PASSWORD_KEY),
CONNECTOR_IOTDB_PASSWORD_DEFAULT_VALUE);
final String securityDir =
- parameters.getStringOrDefault(
- Arrays.asList(CONNECTOR_OPC_UA_SECURITY_DIR_KEY,
SINK_OPC_UA_SECURITY_DIR_KEY),
- CONNECTOR_OPC_UA_SECURITY_DIR_DEFAULT_VALUE
- + File.separatorChar
- + httpsBindPort
- + "_"
- + tcpBindPort);
+ IoTDBConfig.addDataHomeDir(
+ parameters.getStringOrDefault(
+ Arrays.asList(CONNECTOR_OPC_UA_SECURITY_DIR_KEY,
SINK_OPC_UA_SECURITY_DIR_KEY),
+ CONNECTOR_OPC_UA_SECURITY_DIR_DEFAULT_VALUE
+ + File.separatorChar
+ + httpsBindPort
+ + "_"
+ + tcpBindPort));
final boolean enableAnonymousAccess =
parameters.getBooleanOrDefault(
Arrays.asList(
