修复文档配置文件后缀 (#580)

* 修复文档配置文件后缀 * [bugfix][worker]hadoop配置文件yarn 重复jmx_exporter_build_info --------- Co-authored-by: nogc <[email protected]>
datavane · Aug 7, 2024 · f23bfce · f23bfce
1 parent ec2985b
commit f23bfce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git 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"
+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
diff --git a/docs/zh/datasophon集成clickhouse.md b/docs/zh/datasophon集成clickhouse.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"