From f23bfce6479ddf939fd4b75000ed1b91addf58d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E6=B4=AA=E6=B1=9F?=
 <42744791+bigdata2018@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E6=A1=A3=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=8E=E7=BC=80=20(#580)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复文档配置文件后缀

* [bugfix][worker]hadoop配置文件yarn 重复jmx_exporter_build_info

---------

Co-authored-by: nogc <flink2018@163.com>
---
 .../src/main/resources/templates/hadoop-env.ftl      | 12 +++++++++---
 .../datasophon\351\233\206\346\210\220clickhouse.md" |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/datasophon-worker/src/main/resources/templates/hadoop-env.ftl b/datasophon-worker/src/main/resources/templates/hadoop-env.ftl
index 148ce1a3..2891e703 100644
--- a/datasophon-worker/src/main/resources/templates/hadoop-env.ftl
+++ b/datasophon-worker/src/main/resources/templates/hadoop-env.ftl
@@ -30,8 +30,14 @@ export HDFS_JOURNALNODE_OPTS="$HDFS_JOURNALNODE_OPTS -javaagent:${hadoopHome}/jm
 export HDFS_ZKFC_OPTS="$HDFS_ZKFC_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=27004:${hadoopHome}/jmx/prometheus_config.yml"
 
 
-export YARN_RESOURCEMANAGER_OPTS="$YARN_RESOURCEMANAGER_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=9323:${hadoopHome}/jmx/prometheus_config.yml"
+if ! grep -q <<<"$YARN_RESOURCEMANAGER_OPTS" jmx_prometheus_javaagent; then
+YARN_RESOURCEMANAGER_OPTS="$YARN_RESOURCEMANAGER_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=9323:${hadoopHome}/jmx/prometheus_config.yml"
+fi
 
-export YARN_NODEMANAGER_OPTS="$YARN_NODEMANAGER_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=9324:${hadoopHome}/jmx/prometheus_config.yml"
+if ! grep -q <<<"$YARN_NODEMANAGER_OPTS" jmx_prometheus_javaagent; then
+YARN_NODEMANAGER_OPTS="$YARN_NODEMANAGER_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=9324:${hadoopHome}/jmx/prometheus_config.yml"
+fi
 
-export MAPRED_HISTORYSERVER_OPTS="$MAPRED_HISTORYSERVER_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=9325:${hadoopHome}/jmx/prometheus_config.yml"
\ No newline at end of file
+if ! grep -q <<<"$YARN_HISTORYSERVER_OPTS" jmx_prometheus_javaagent; then
+YARN_HISTORYSERVER_OPTS="$YARN_HISTORYSERVER_OPTS -javaagent:${hadoopHome}/jmx/jmx_prometheus_javaagent-0.16.1.jar=9325:${hadoopHome}/jmx/prometheus_config.yml"
+fi
\ No newline at end of file
diff --git "a/docs/zh/datasophon\351\233\206\346\210\220clickhouse.md" "b/docs/zh/datasophon\351\233\206\346\210\220clickhouse.md"
index 8ef74a2a..463e1e86 100644
--- "a/docs/zh/datasophon\351\233\206\346\210\220clickhouse.md"
+++ "b/docs/zh/datasophon\351\233\206\346\210\220clickhouse.md"
@@ -1761,7 +1761,7 @@ worker打包替换旧包
         "filename": "config.xml",
         "configFormat": "custom",
         "outputDirectory": "etc",
-        "templateName": "clickhouse-server-config.flt",
+        "templateName": "clickhouse-server-config.ftl",
         "includeParams": [
           "tcpPort",
           "shardAddress",
@@ -1772,7 +1772,7 @@ worker打包替换旧包
         "filename": "users.xml",
         "configFormat": "custom",
         "outputDirectory": "etc",
-        "templateName": "clickhouse-user.flt",
+        "templateName": "clickhouse-user.ftl",
         "includeParams": [
           "username",
           "password"