You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2025/10/01 03:30:48 UTC
(iotdb) 01/01: Revert "Adjust encrypt config file. (#16528)"
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch revert-global-encrypt
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a391460e6bd612e184c84afc72669efd213787ab
Author: Yongzao <53...@qq.com>
AuthorDate: Wed Oct 1 11:30:34 2025 +0800
Revert "Adjust encrypt config file. (#16528)"
This reverts commit 7235ec9130578074b2589d0186517997a794ef10.
---
.../iotdb/confignode/service/ConfigNode.java | 24 ----------------------
.../java/org/apache/iotdb/db/service/DataNode.java | 21 -------------------
2 files changed, 45 deletions(-)
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index ac1cc35dc6c..f20f77095d9 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.ServerCommandLine;
-import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.client.ClientManagerMetrics;
import org.apache.iotdb.commons.concurrent.ThreadModule;
import org.apache.iotdb.commons.concurrent.ThreadName;
@@ -161,17 +160,6 @@ public class ConfigNode extends ServerCommandLine implements ConfigNodeMBean {
LOGGER.info("Activating {}...", ConfigNodeConstant.GLOBAL_NAME);
try {
- try {
- loadSecretKey();
- loadHardwareCode();
- initEncryptProps();
- } catch (IOException e) {
- initSecretKey();
- loadSecretKey();
- loadHardwareCode();
- initEncryptProps();
- }
- encryptConfigFile();
processPid();
// Add shutdown hook
addShutDownHook();
@@ -452,18 +440,6 @@ public class ConfigNode extends ServerCommandLine implements ConfigNodeMBean {
// Do nothing
}
- protected void initEncryptProps() {
- // Do nothing
- }
-
- protected void initSecretKey() throws AuthException, IOException {
- // Do nothing
- }
-
- protected void encryptConfigFile() {
- // Do nothing
- }
-
private TConfigNodeLocation generateConfigNodeLocation(int configNodeId) {
return new TConfigNodeLocation(
configNodeId,
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
index ad89714fe12..cebf7dab9f3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -253,18 +253,9 @@ public class DataNode extends ServerCommandLine implements DataNodeMBean {
}
// Send restart request of this DataNode
sendRestartRequestToConfigNode();
- }
- try {
- loadSecretKey();
- loadHardwareCode();
- initEncryptProps();
- } catch (IOException e) {
- initSecretKey();
loadSecretKey();
loadHardwareCode();
- initEncryptProps();
}
- encryptConfigFile();
// TierManager need DataNodeId to do some operations so the reset method need to be invoked
// after DataNode adding
TierManager.getInstance().resetFolders();
@@ -598,18 +589,6 @@ public class DataNode extends ServerCommandLine implements DataNodeMBean {
// Do nothing
}
- protected void initEncryptProps() {
- // Do nothing
- }
-
- protected void initSecretKey() throws IOException {
- // Do nothing
- }
-
- protected void encryptConfigFile() {
- // Do nothing
- }
-
private void makeRegionsCorrect(List<TRegionReplicaSet> correctRegions) {
List<ConsensusGroupId> dataNodeConsensusGroupIds =
correctRegions.stream()