From ced1034c1fc5c90df1074fcc58a6abdbda7ecd13 Mon Sep 17 00:00:00 2001
From: xiaojian <stdnt_xiao@163.com>
Date: Mon, 25 Dec 2023 19:34:57 +0800
Subject: [PATCH 1/2] dev-multi-hdfs-datapath

---
 .../EDP-1.0.0/hdfs/render/hadoop-hdfs-env.sh.ftl         | 2 +-
 cloudeon-stack/EDP-1.0.0/hdfs/render/hdfs-site.xml.ftl   | 2 +-
 cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml          | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cloudeon-stack/EDP-1.0.0/hdfs/render/hadoop-hdfs-env.sh.ftl b/cloudeon-stack/EDP-1.0.0/hdfs/render/hadoop-hdfs-env.sh.ftl
index 32604fa8..abe17d1c 100644
--- a/cloudeon-stack/EDP-1.0.0/hdfs/render/hadoop-hdfs-env.sh.ftl
+++ b/cloudeon-stack/EDP-1.0.0/hdfs/render/hadoop-hdfs-env.sh.ftl
@@ -105,5 +105,5 @@ export JOURNALNODE_RPC_PORT=${conf['journalnode.rpc-port']}
 export DATANODE_DATA_DIRS=/opt/edp/${service.serviceName}/data/datanode
 
 # Export dfs.namenode.name.dir
-export NAMENODE_DATA_DIRS=/opt/edp/${service.serviceName}/data/namenode
+export DATANODE_DATA_DIRS=${conf['dfs.datanode.data.dir']}
 
diff --git a/cloudeon-stack/EDP-1.0.0/hdfs/render/hdfs-site.xml.ftl b/cloudeon-stack/EDP-1.0.0/hdfs/render/hdfs-site.xml.ftl
index beb3b0ea..f3b796a3 100644
--- a/cloudeon-stack/EDP-1.0.0/hdfs/render/hdfs-site.xml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/hdfs/render/hdfs-site.xml.ftl
@@ -48,7 +48,7 @@
 </#if>
 
 <#--handle data dir-->
-<@property "dfs.datanode.data.dir" "/opt/edp/${serviceName}/data/datanode"/>
+<@property "dfs.datanode.data.dir" "${conf['dfs.datanode.data.dir']}"/>
 <@property "dfs.namenode.name.dir" "/opt/edp/${serviceName}/data/namenode"/>
 <@property "dfs.journalnode.edits.dir" "/opt/edp/${serviceName}/data/journal"/>
 
diff --git a/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml b/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml
index d88b55c3..51435e91 100644
--- a/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml
+++ b/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml
@@ -192,6 +192,15 @@ configurations:
     tag: "常用参数"
 
 
+- name: dfs.datanode.data.dir
+    recommendExpression: /opt/edp/hdfs/data/datanode
+    valueType: InputString
+    description: HDFS数据目录，多个目录使用","分割。子目录需在/opt/edp/hdfs/data目录下，提前创建需设置为sshd用户。
+    confFile:  "hdfs-site.xml"
+    configurableInWizard: true
+    tag: "常用参数"
+
+
   - name: dfs.datanode.data.dir.perm
     recommendExpression: 755
     valueType: InputNumber

From 1b3dfd767417fc219f63cd88b3e6e14452ad3902 Mon Sep 17 00:00:00 2001
From: xiaojian <stdnt_xiao@163.com>
Date: Tue, 26 Dec 2023 10:10:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml b/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml
index 51435e91..1bd39b6b 100644
--- a/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml
+++ b/cloudeon-stack/EDP-1.0.0/hdfs/service-info.yaml
@@ -192,7 +192,7 @@ configurations:
     tag: "常用参数"
 
 
-- name: dfs.datanode.data.dir
+  - name: dfs.datanode.data.dir
     recommendExpression: /opt/edp/hdfs/data/datanode
     valueType: InputString
     description: HDFS数据目录，多个目录使用","分割。子目录需在/opt/edp/hdfs/data目录下，提前创建需设置为sshd用户。