This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 88e1d78fa [Feature] Remove ldh image dependence of
mysql-connector-java jar (#3614)
88e1d78fa is described below
commit 88e1d78fab6134a9d9a68d8eea123dd3b2cb4b15
Author: Casion <[email protected]>
AuthorDate: Tue Oct 11 23:13:27 2022 +0800
[Feature] Remove ldh image dependence of mysql-connector-java jar (#3614)
* adjust linkis script
modify docs
fix MetaClassLoader
* adjust linkis script
modify docs
fix MetaClassLoader
ldh mysql connector jar
* ldh mysql connector jar
* add build linkis-ldh image
---
.github/workflows/publish-docker.yaml | 5 ++-
README.md | 2 +-
README_CN.md | 2 +-
docs/configuration-change-records.md | 7 ++++
docs/{ => configure}/accessible-executor.md | 4 +--
docs/{ => configure}/elasticsearch.md | 4 +--
docs/{ => configure}/executor-core.md | 4 +--
docs/{ => configure}/flink.md | 5 ++-
docs/{ => configure}/jdbc.md | 4 +--
docs/{ => configure}/linkis-application-manager.md | 4 +--
docs/{ => configure}/linkis-bml-server.md | 5 ++-
docs/{ => configure}/linkis-common.md | 4 +--
docs/{ => configure}/linkis-computation-client.md | 4 +--
.../linkis-computation-engineconn.md | 4 +--
.../linkis-computation-governance-common.md | 4 +--
.../linkis-computation-orchestrator.md | 4 +--
docs/{ => configure}/linkis-configuration.md | 4 +--
docs/{ => configure}/linkis-engineconn-common.md | 4 +--
.../linkis-engineconn-manager-core.md | 4 +--
.../linkis-engineconn-manager-server.md | 4 +--
.../linkis-engineconn-plugin-core.md | 4 +--
.../linkis-engineconn-plugin-server.md | 4 +--
docs/{ => configure}/linkis-entrance.md | 4 +--
docs/{ => configure}/linkis-gateway-core.md | 4 +--
.../linkis-gateway-httpclient-support.md | 4 +--
docs/{ => configure}/linkis-hadoop-common.md | 4 +--
docs/{ => configure}/linkis-httpclient.md | 4 +--
.../linkis-instance-label-client.md | 4 +--
docs/{ => configure}/linkis-io-file-client.md | 4 +--
docs/{ => configure}/linkis-jdbc-driver.md | 4 +--
docs/{ => configure}/linkis-jobhistory.md | 4 +--
docs/{ => configure}/linkis-manager-common.md | 4 +--
docs/{ => configure}/linkis-metadata.md | 4 +--
docs/{ => configure}/linkis-module.md | 4 +--
docs/{ => configure}/linkis-orchestrator-core.md | 4 +--
docs/{ => configure}/linkis-protocol.md | 4 +--
docs/{ => configure}/linkis-rpc.md | 4 +--
docs/{ => configure}/linkis-scheduler.md | 4 +--
.../{ => configure}/linkis-spring-cloud-gateway.md | 4 +--
docs/{ => configure}/linkis-storage.md | 4 +--
docs/{ => configure}/linkis-udf.md | 4 +--
docs/{ => configure}/pipeline.md | 4 +--
docs/{ => configure}/presto.md | 4 +--
docs/{ => configure}/python.md | 4 +--
docs/{ => configure}/spark.md | 4 +--
docs/{ => configure}/sqoop.md | 4 +--
docs/index.md | 2 ++
docs/info-1.1.3.md | 7 ----
linkis-dist/bin/checkEnv.sh | 8 -----
linkis-dist/bin/install.sh | 38 ----------------------
linkis-dist/deploy-config/linkis-env.sh | 16 ---------
linkis-dist/docker/ldh.Dockerfile | 7 ++--
linkis-dist/docker/scripts/entry-point-ldh.sh | 10 ++++++
linkis-dist/docker/scripts/prepare-ldh-image.sh | 4 +--
linkis-dist/helm/scripts/resources/ldh/ldh.yaml | 6 ++++
linkis-dist/package/sbin/graceful-upgrade.sh | 9 -----
linkis-dist/package/sbin/linkis-start-all.sh | 4 +--
.../server/loader/MetaClassLoaderManager.java | 3 +-
58 files changed, 123 insertions(+), 177 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 8ef2de273..d90133c7c 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -66,7 +66,7 @@ jobs:
./mvnw -N install
- name: Build backend by maven
run: |
- ./mvnw install -Pdocker -Dmaven.javadoc.skip=true
-Dmaven.test.skip=true -Dlinkis.build.web=true
+ ./mvnw install -Pdocker -Dmaven.javadoc.skip=true
-Dmaven.test.skip=true -Dlinkis.build.web=true -Dlinkis.build.ldh=true
- name: Log in to the Container registry
uses: docker/[email protected]
with:
@@ -82,3 +82,6 @@ jobs:
docker push ${{ env.HUB }}/linkis:${{ env.DOCKER_VERSION }}
docker tag linkis-web:${{ env.LINKIS_VERSION }} ${{ env.HUB
}}/linkis-web:${{ env.DOCKER_VERSION }}
docker push ${{ env.HUB }}/linkis-web:${{ env.DOCKER_VERSION }}
+
+ docker tag linkis-ldh:${{ env.LINKIS_VERSION }} ${{ env.HUB
}}/linkis-ldh:${{ env.DOCKER_VERSION }}
+ docker push ${{ env.HUB }}/linkis-ldh:${{ env.DOCKER_VERSION }}
diff --git a/README.md b/README.md
index 524bcc087..1d0ecd245 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
<img src="https://img.shields.io/badge/JDK-8-green.svg"; />
</a>
<a target="_blank"
href="https://github.com/apache/incubator-linkis/actions";>
- <img
src="https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg";
/>
+ <img
src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg";
/>
</a>
<a target="_blank" href='https://github.com/apache/incubator-linkis'>
diff --git a/README_CN.md b/README_CN.md
index 2846df54e..e906a6978 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -30,7 +30,7 @@
<img src="https://img.shields.io/badge/JDK-8-green.svg"; />
</a>
<a target="_blank"
href="https://github.com/apache/incubator-linkis/actions";>
- <img
src="https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg";
/>
+ <img
src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg";
/>
</a>
<a target="_blank" href='https://github.com/apache/incubator-linkis'>
diff --git a/docs/configuration-change-records.md
b/docs/configuration-change-records.md
new file mode 100644
index 000000000..908c62afc
--- /dev/null
+++ b/docs/configuration-change-records.md
@@ -0,0 +1,7 @@
+## configuration change
+
+
+| Module Name (Service Name) |Type| Parameter Name | Default Value |
Description |
+| ----------- | ----- | ------------------------------- | ---------------- |
-------------------- |
+|ps-metadataquery | Modify | wds.linkis.server.mdm.module.name<br/>-><br/>
linkis.server.mdq.module.name | metadataquery|metadata query service name|
+|ps-metadataquery | Modify | wds.linkis.server.dsm.module.name<br/>-><br/>
linkis.server.dsm.module.name | data-source-manager|Data Source Management
Service Name |
\ No newline at end of file
diff --git a/docs/accessible-executor.md b/docs/configure/accessible-executor.md
similarity index 91%
rename from docs/accessible-executor.md
rename to docs/configure/accessible-executor.md
index fea3432cc..8ba1bbfbc 100644
--- a/docs/accessible-executor.md
+++ b/docs/configure/accessible-executor.md
@@ -1,7 +1,7 @@
-## accessible-executor 配置
+## accessible-executor configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|accessible-executor|wds.linkis.engineconn.log.cache.default|500|cache.default|
|accessible-executor|wds.linkis.engineconn.ignore.words|org.apache.spark.deploy.yarn.Client
|ignore.words|
diff --git a/docs/elasticsearch.md b/docs/configure/elasticsearch.md
similarity index 90%
rename from docs/elasticsearch.md
rename to docs/configure/elasticsearch.md
index f6e4cf738..2104c0b0e 100644
--- a/docs/elasticsearch.md
+++ b/docs/configure/elasticsearch.md
@@ -1,7 +1,7 @@
-## elasticsearch 配置
+## elasticsearch configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|elasticsearch|linkis.es.cluster|127.0.0.1:9200|cluster|
|elasticsearch|linkis.datasource|default_datasource |linkis.datasource|
diff --git a/docs/executor-core.md b/docs/configure/executor-core.md
similarity index 92%
rename from docs/executor-core.md
rename to docs/configure/executor-core.md
index 9af0d2bb9..fb595fe2f 100644
--- a/docs/executor-core.md
+++ b/docs/configure/executor-core.md
@@ -1,7 +1,7 @@
-## executor-core 配置
+## executor-core configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|executor-core|wds.linkis.dataworkclod.engine.tmp.path|file:///tmp/|engine.tmp.path|
|executor-core|wds.linkis.engine.application.name | |application.name|
diff --git a/docs/flink.md b/docs/configure/flink.md
similarity index 96%
rename from docs/flink.md
rename to docs/configure/flink.md
index 92bd21650..ff1e5e97c 100644
--- a/docs/flink.md
+++ b/docs/configure/flink.md
@@ -1,7 +1,6 @@
-## flink 配置
+## flink configure
-
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|flink|flink.client.memory |1024|client.memory |
|flink|flink.taskmanager.memory|4096 |taskmanager.memory|
diff --git a/docs/jdbc.md b/docs/configure/jdbc.md
similarity index 77%
rename from docs/jdbc.md
rename to docs/configure/jdbc.md
index 4caea6c88..ce36bb8f4 100644
--- a/docs/jdbc.md
+++ b/docs/configure/jdbc.md
@@ -1,6 +1,6 @@
-## jdbc 配置项
+## jdbc configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|jdbc|wds.linkis.resultSet.cache.max| 0k |cache.max|
|jdbc|wds.linkis.jdbc.default.limit |5000 |jdbc.default.limit|
diff --git a/docs/linkis-application-manager.md
b/docs/configure/linkis-application-manager.md
similarity index 96%
rename from docs/linkis-application-manager.md
rename to docs/configure/linkis-application-manager.md
index fe78e026f..543623f59 100644
--- a/docs/linkis-application-manager.md
+++ b/docs/configure/linkis-application-manager.md
@@ -1,7 +1,7 @@
-## linkis-application-manager 配置
+## linkis-application-manager configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-application-manager|wds.linkis.label.node.long.lived.label.keys
|tenant|lived.label.keys|
|linkis-application-manager|wds.linkis.governance.admin.operations|
|admin.operations|
diff --git a/docs/linkis-bml-server.md b/docs/configure/linkis-bml-server.md
similarity index 82%
rename from docs/linkis-bml-server.md
rename to docs/configure/linkis-bml-server.md
index 9a28b9b76..473f648b4 100644
--- a/docs/linkis-bml-server.md
+++ b/docs/configure/linkis-bml-server.md
@@ -1,7 +1,6 @@
-## linkis-bml-server 配置
+## linkis-bml-server configure
-
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
|linkis-bml-server|wds.linkis.bml.hdfs.prefix| /apps-data | bml.hdfs.prefix|
|linkis-bml-server|wds.linkis.bml.local.prefix|true|bml.local.prefix|
diff --git a/docs/linkis-common.md b/docs/configure/linkis-common.md
similarity index 92%
rename from docs/linkis-common.md
rename to docs/configure/linkis-common.md
index af4b708ad..fd3f0f198 100644
--- a/docs/linkis-common.md
+++ b/docs/configure/linkis-common.md
@@ -1,6 +1,6 @@
-## linkis-common 配置项
+## linkis-common configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-common|wds.linkis.encoding|utf-8|字符类型|true|
|linkis-common|wds.linkis.date.pattern |yyyy-MM-dd'T'HH:mm:ssZ |时间格式|true|
diff --git a/docs/linkis-computation-client.md
b/docs/configure/linkis-computation-client.md
similarity index 53%
rename from docs/linkis-computation-client.md
rename to docs/configure/linkis-computation-client.md
index 49d1edbe4..3f8b70cb2 100644
--- a/docs/linkis-computation-client.md
+++ b/docs/configure/linkis-computation-client.md
@@ -1,7 +1,7 @@
-## linkis-computation-client 配置
+## linkis-computation-client configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-computation-client
|linkis.client.operator.once.log.enable|true|once.log.enable|
diff --git a/docs/linkis-computation-engineconn.md
b/docs/configure/linkis-computation-engineconn.md
similarity index 94%
rename from docs/linkis-computation-engineconn.md
rename to docs/configure/linkis-computation-engineconn.md
index 8ed71a815..379362364 100644
--- a/docs/linkis-computation-engineconn.md
+++ b/docs/configure/linkis-computation-engineconn.md
@@ -1,7 +1,7 @@
-## linkis-computation-engineconn 配置
+## linkis-computation-engineconn configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-computation-engineconn|wds.linkis.engine.resultSet.cache.max
|0k|engine.resultSet.cache.max|
|linkis-computation-engineconn|wds.linkis.engine.lock.expire.time|2 * 60 *
1000 |lock.expire.time|
diff --git a/docs/linkis-computation-governance-common.md
b/docs/configure/linkis-computation-governance-common.md
similarity index 93%
rename from docs/linkis-computation-governance-common.md
rename to docs/configure/linkis-computation-governance-common.md
index 2687b60a3..f4b0a8588 100644
--- a/docs/linkis-computation-governance-common.md
+++ b/docs/configure/linkis-computation-governance-common.md
@@ -1,7 +1,7 @@
-## linkis-computation-governance-common 配置
+## linkis-computation-governance-common configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
|linkis-computation-governance-common|wds.linkis.rm| | wds.linkis.rm |
|linkis-computation-governance-common|wds.linkis.spark.engine.version|2.4.3
|spark.engine.version|
diff --git a/docs/linkis-computation-orchestrator.md
b/docs/configure/linkis-computation-orchestrator.md
similarity index 93%
rename from docs/linkis-computation-orchestrator.md
rename to docs/configure/linkis-computation-orchestrator.md
index d46ada115..ab7abe5a8 100644
--- a/docs/linkis-computation-orchestrator.md
+++ b/docs/configure/linkis-computation-orchestrator.md
@@ -1,7 +1,7 @@
-## linkis-computation-orchestrator 配置
+## linkis-computation-orchestrator configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-computation-orchestrator|wds.linkis.computation.orchestrator.create.service
|dss|orchestrator.create.service|
|linkis-computation-orchestrator|wds.linkis.computation.orchestrator.mark.max.engine|3
|orchestrator.mark.max.engine|
diff --git a/docs/linkis-configuration.md
b/docs/configure/linkis-configuration.md
similarity index 76%
rename from docs/linkis-configuration.md
rename to docs/configure/linkis-configuration.md
index eecca3179..b0aa96794 100644
--- a/docs/linkis-configuration.md
+++ b/docs/configure/linkis-configuration.md
@@ -1,7 +1,7 @@
-## linkis-configuration 配置
+## linkis-configuration configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-configuration |wds.linkis.configuration.engine.type|
|configuration.engine.type|
| linkis-configuration
|wds.linkis.engineconn.manager.name|linkis-cg-linkismanager
|engineconn.manager.name|
diff --git a/docs/linkis-engineconn-common.md
b/docs/configure/linkis-engineconn-common.md
similarity index 91%
rename from docs/linkis-engineconn-common.md
rename to docs/configure/linkis-engineconn-common.md
index ca45af2ce..5484165b5 100644
--- a/docs/linkis-engineconn-common.md
+++ b/docs/configure/linkis-engineconn-common.md
@@ -1,7 +1,7 @@
-## linkis-engineconn-common 配置
+## linkis-engineconn-common configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-engineconn-common|wds.linkis.engine.connector.executions|org.apache.linkis.engineconn.computation.executor.execute.ComputationEngineConnExecution|connector.executions|
|linkis-engineconn-common|wds.linkis.engine.connector.hooks
|org.apache.linkis.engineconn.computation.executor.hook.ComputationEngineConnHook
|engine.connector.hooks|
diff --git a/docs/linkis-engineconn-manager-core.md
b/docs/configure/linkis-engineconn-manager-core.md
similarity index 50%
rename from docs/linkis-engineconn-manager-core.md
rename to docs/configure/linkis-engineconn-manager-core.md
index 883029874..b38672d85 100644
--- a/docs/linkis-engineconn-manager-core.md
+++ b/docs/configure/linkis-engineconn-manager-core.md
@@ -1,7 +1,7 @@
-## linkis-engineconn-manager-core 配置
+## linkis-engineconn-manager-core configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-engineconn-manager-core
|linkis.ec.core.dump.disable|true|dump.disable|
diff --git a/docs/linkis-engineconn-manager-server.md
b/docs/configure/linkis-engineconn-manager-server.md
similarity index 95%
rename from docs/linkis-engineconn-manager-server.md
rename to docs/configure/linkis-engineconn-manager-server.md
index c3d34cbf3..efd9e0794 100644
--- a/docs/linkis-engineconn-manager-server.md
+++ b/docs/configure/linkis-engineconn-manager-server.md
@@ -1,7 +1,7 @@
-## linkis-engineconn-manager-server 配置
+## linkis-engineconn-manager-server configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-engineconn-manager-server|wds.linkis.ecm.async.bus.capacity
|500|bus.capacity|
|linkis-engineconn-manager-server|wds.linkis.ecm.async.bus.name|em_async_bus
|async.bus.name|
diff --git a/docs/linkis-engineconn-plugin-core.md
b/docs/configure/linkis-engineconn-plugin-core.md
similarity index 91%
rename from docs/linkis-engineconn-plugin-core.md
rename to docs/configure/linkis-engineconn-plugin-core.md
index 88b1146f3..542f5cc25 100644
--- a/docs/linkis-engineconn-plugin-core.md
+++ b/docs/configure/linkis-engineconn-plugin-core.md
@@ -1,7 +1,7 @@
-## linkis-engineconn-plugin-core 配置
+## linkis-engineconn-plugin-core configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-engineconn-plugin-core|wds.linkis.engineConn.jars|engineConn额外的Jars|engineConn.jars|
|linkis-engineconn-plugin-core|wds.linkis.engineConn.files |engineConn额外的配置文件
|engineConn.files |
diff --git a/docs/linkis-engineconn-plugin-server.md
b/docs/configure/linkis-engineconn-plugin-server.md
similarity index 86%
rename from docs/linkis-engineconn-plugin-server.md
rename to docs/configure/linkis-engineconn-plugin-server.md
index 4c8f301cf..539edf6dd 100644
--- a/docs/linkis-engineconn-plugin-server.md
+++ b/docs/configure/linkis-engineconn-plugin-server.md
@@ -1,7 +1,7 @@
-## linkis-engineconn-plugin-server 配置
+## linkis-engineconn-plugin-server configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| wds.linkis.engineconn.plugin.loader.classname | |plugin.loader.classname|
| wds.linkis.engineconn.plugin.loader.defaultUser | hadoop
|wds.linkis.engineconn.plugin.loader.defaultUser|
diff --git a/docs/linkis-entrance.md b/docs/configure/linkis-entrance.md
similarity index 97%
rename from docs/linkis-entrance.md
rename to docs/configure/linkis-entrance.md
index ec928f222..c1d640986 100644
--- a/docs/linkis-entrance.md
+++ b/docs/configure/linkis-entrance.md
@@ -1,7 +1,7 @@
-## linkis-entrance 配置
+## linkis-entrance configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-entrance|wds.linkis.entrance.scheduler.maxParallelismUsers |1000|
scheduler.maxParallelismUsers|
|linkis-entrance|wds.linkis.entrance.listenerBus.queue.capacity|5000
|queue.capacity|
diff --git a/docs/linkis-gateway-core.md b/docs/configure/linkis-gateway-core.md
similarity index 96%
rename from docs/linkis-gateway-core.md
rename to docs/configure/linkis-gateway-core.md
index 983bcc918..be933b2a2 100644
--- a/docs/linkis-gateway-core.md
+++ b/docs/configure/linkis-gateway-core.md
@@ -1,7 +1,7 @@
-## linkis-gateway-core 配置
+## linkis-gateway-core configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-gateway-core|wds.linkis.gateway.conf.enable.proxy.user
|false|gateway.conf.enable.proxy.user|
|linkis-gateway-core|wds.linkis.gateway.conf.proxy.user.config|proxy.properties|proxy.user.config|
diff --git a/docs/linkis-gateway-httpclient-support.md
b/docs/configure/linkis-gateway-httpclient-support.md
similarity index 56%
rename from docs/linkis-gateway-httpclient-support.md
rename to docs/configure/linkis-gateway-httpclient-support.md
index 04e138331..49e2020a6 100644
--- a/docs/linkis-gateway-httpclient-support.md
+++ b/docs/configure/linkis-gateway-httpclient-support.md
@@ -1,6 +1,6 @@
-## linkis-gateway-httpclient-support 配置
+## linkis-gateway-httpclient-support configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-gateway-httpclient-support
|linkis.gateway.enabled.defalut.discovery|true|gateway.enabled.defalut.discovery|
diff --git a/docs/linkis-hadoop-common.md
b/docs/configure/linkis-hadoop-common.md
similarity index 90%
rename from docs/linkis-hadoop-common.md
rename to docs/configure/linkis-hadoop-common.md
index d30ea5aba..d151ce108 100644
--- a/docs/linkis-hadoop-common.md
+++ b/docs/configure/linkis-hadoop-common.md
@@ -1,7 +1,7 @@
-## linkis-hadoop-common 配置
+## linkis-hadoop-common configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-hadoop-common|wds.linkis.hadoop.root.user|hadoop-8|hadoop.root.user|true|
|linkis-hadoop-common|wds.linkis.keytab.enable |false |keytab.enable|true|
diff --git a/docs/linkis-httpclient.md b/docs/configure/linkis-httpclient.md
similarity index 59%
rename from docs/linkis-httpclient.md
rename to docs/configure/linkis-httpclient.md
index 695cb2e80..1e391ac7a 100644
--- a/docs/linkis-httpclient.md
+++ b/docs/configure/linkis-httpclient.md
@@ -1,7 +1,7 @@
-## linkis-httpclient 配置
+## linkis-httpclient configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-httpclient|wds.linkis.httpclient.default.connect.timeOut| 50000 |
httpclient.default.connect.timeOut |true|
diff --git a/docs/linkis-instance-label-client.md
b/docs/configure/linkis-instance-label-client.md
similarity index 57%
rename from docs/linkis-instance-label-client.md
rename to docs/configure/linkis-instance-label-client.md
index 11a521362..a1c167979 100644
--- a/docs/linkis-instance-label-client.md
+++ b/docs/configure/linkis-instance-label-client.md
@@ -1,7 +1,7 @@
-## linkis-instance-label-client 配置
+## linkis-instance-label-client configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-instance-label-client
|wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
diff --git a/docs/linkis-io-file-client.md
b/docs/configure/linkis-io-file-client.md
similarity index 83%
rename from docs/linkis-io-file-client.md
rename to docs/configure/linkis-io-file-client.md
index 07045e9f4..a4ab1f4f4 100644
--- a/docs/linkis-io-file-client.md
+++ b/docs/configure/linkis-io-file-client.md
@@ -1,7 +1,7 @@
-## linkis-io-file-client 配置
+## linkis-io-file-client configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-io-file-client|wds.linkis.io.group.factory.capacity
|1000|group.factory.capacity|
|linkis-io-file-client|wds.linkis.io.group.factory.running.jobs|30
|group.factory.running.jobs|
diff --git a/docs/linkis-jdbc-driver.md b/docs/configure/linkis-jdbc-driver.md
similarity index 61%
rename from docs/linkis-jdbc-driver.md
rename to docs/configure/linkis-jdbc-driver.md
index cf063f00e..12a5179db 100644
--- a/docs/linkis-jdbc-driver.md
+++ b/docs/configure/linkis-jdbc-driver.md
@@ -1,7 +1,7 @@
-## linkis-jdbc-driver 配置
+## linkis-jdbc-driver configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-jdbc-driver
|wds.linkis.jdbc.pre.hook.class|org.apache.linkis.ujes.jdbc.hook.impl.TableauPreExecutionHook|pre.hook.class|
diff --git a/docs/linkis-jobhistory.md b/docs/configure/linkis-jobhistory.md
similarity index 91%
rename from docs/linkis-jobhistory.md
rename to docs/configure/linkis-jobhistory.md
index 8046b185b..37f5e454d 100644
--- a/docs/linkis-jobhistory.md
+++ b/docs/configure/linkis-jobhistory.md
@@ -1,7 +1,7 @@
-## linkis-jobhistory 配置
+## linkis-jobhistory configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-jobhistory|wds.linkis.jobhistory.safe.trigger
|true|jobhistory.safe.trigger|
|linkis-jobhistory|wds.linkis.entrance.spring.name| linkis-cg-entrance
|entrance.spring.name|
diff --git a/docs/linkis-manager-common.md
b/docs/configure/linkis-manager-common.md
similarity index 96%
rename from docs/linkis-manager-common.md
rename to docs/configure/linkis-manager-common.md
index 776521ea9..20e193348 100644
--- a/docs/linkis-manager-common.md
+++ b/docs/configure/linkis-manager-common.md
@@ -1,7 +1,7 @@
-## linkis-manager-common 配置
+## linkis-manager-common configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-manager-common|wds.linkis.default.engine.type |spark|engine.type|
|linkis-manager-common|wds.linkis.manager.admin|2.4.3|manager.admin|
diff --git a/docs/linkis-metadata.md b/docs/configure/linkis-metadata.md
similarity index 76%
rename from docs/linkis-metadata.md
rename to docs/configure/linkis-metadata.md
index 612e56d20..8bdd35f86 100644
--- a/docs/linkis-metadata.md
+++ b/docs/configure/linkis-metadata.md
@@ -1,7 +1,7 @@
-## linkis-metadata 配置
+## linkis-metadata configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-metadata
|bdp.dataworkcloud.datasource.store.type|orc|datasource.store.type|
| linkis-metadata
|bdp.dataworkcloud.datasource.default.par.name|ds|datasource.default.par.name|
diff --git a/docs/linkis-module.md b/docs/configure/linkis-module.md
similarity index 97%
rename from docs/linkis-module.md
rename to docs/configure/linkis-module.md
index 6e8fc96d9..242071105 100644
--- a/docs/linkis-module.md
+++ b/docs/configure/linkis-module.md
@@ -1,7 +1,7 @@
-## linkis-module 配置
+## linkis-module configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-module|wds.linkis.server.component.exclude.packages| |
exclude.packages |true|
|linkis-module|wds.linkis.server.component.exclude.classes|
|exclude.classes|true|
diff --git a/docs/linkis-orchestrator-core.md
b/docs/configure/linkis-orchestrator-core.md
similarity index 95%
rename from docs/linkis-orchestrator-core.md
rename to docs/configure/linkis-orchestrator-core.md
index fed8229a2..f3fe21e09 100644
--- a/docs/linkis-orchestrator-core.md
+++ b/docs/configure/linkis-orchestrator-core.md
@@ -1,7 +1,7 @@
-## linkis-orchestrator-core 配置
+## linkis-orchestrator-core configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-orchestrator-core|wds.linkis.orchestrator.builder.class |
|orchestrator.builder.class|
|linkis-orchestrator-core|wds.linkis.orchestrator.version|1.0.0|orchestrator.version|
diff --git a/docs/linkis-protocol.md b/docs/configure/linkis-protocol.md
similarity index 57%
rename from docs/linkis-protocol.md
rename to docs/configure/linkis-protocol.md
index 980fe061a..f967ed72d 100644
--- a/docs/linkis-protocol.md
+++ b/docs/configure/linkis-protocol.md
@@ -1,7 +1,7 @@
-## linkis-protocol 配置
+## linkis-protocol configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-protocol|wds.linkis.service.suffix| engineManager,entrance,engine |
service.suffix |true|
diff --git a/docs/linkis-rpc.md b/docs/configure/linkis-rpc.md
similarity index 94%
rename from docs/linkis-rpc.md
rename to docs/configure/linkis-rpc.md
index e5d74d2d0..ec2b96cd5 100644
--- a/docs/linkis-rpc.md
+++ b/docs/configure/linkis-rpc.md
@@ -1,7 +1,7 @@
-## linkis-rpc 配置
+## linkis-rpc configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-rpc|wds.linkis.rpc.broadcast.thread.num| 25 | thread.num |true|
|linkis-rpc|wds.linkis.rpc.eureka.client.refresh.interval| 1s
|refresh.interval|true|
diff --git a/docs/linkis-scheduler.md b/docs/configure/linkis-scheduler.md
similarity index 78%
rename from docs/linkis-scheduler.md
rename to docs/configure/linkis-scheduler.md
index c01ac8c74..7765e0960 100644
--- a/docs/linkis-scheduler.md
+++ b/docs/configure/linkis-scheduler.md
@@ -1,7 +1,7 @@
-## linkis-scheduler 配置
+## linkis-scheduler configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-scheduler|wds.linkis.fifo.consumer.auto.clear.enabled|true |
auto.clear.enabled|true|
|linkis-scheduler|wds.linkis.fifo.consumer.max.idle.time|1h
|max.idle.time|true|
diff --git a/docs/linkis-spring-cloud-gateway.md
b/docs/configure/linkis-spring-cloud-gateway.md
similarity index 54%
rename from docs/linkis-spring-cloud-gateway.md
rename to docs/configure/linkis-spring-cloud-gateway.md
index d6209b33a..f3bdb8ed3 100644
--- a/docs/linkis-spring-cloud-gateway.md
+++ b/docs/configure/linkis-spring-cloud-gateway.md
@@ -1,7 +1,7 @@
-## linkis-spring-cloud-gateway 配置
+## linkis-spring-cloud-gateway configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
| linkis-spring-cloud-gateway
|wds.linkis.gateway.websocket.heartbeat|5s|gateway.websocket.heartbeat|
diff --git a/docs/linkis-storage.md b/docs/configure/linkis-storage.md
similarity index 95%
rename from docs/linkis-storage.md
rename to docs/configure/linkis-storage.md
index d773c0f61..fdb753ef5 100644
--- a/docs/linkis-storage.md
+++ b/docs/configure/linkis-storage.md
@@ -1,7 +1,7 @@
-## linkis-storage 配置
+## linkis-storage configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-storage|wds.linkis.storage.proxy.user| | storage.proxy.user |true|
|linkis-storage|wds.linkis.storage.root.user| hadoop |storage.root.user|true|
diff --git a/docs/linkis-udf.md b/docs/configure/linkis-udf.md
similarity index 82%
rename from docs/linkis-udf.md
rename to docs/configure/linkis-udf.md
index b21020e23..f2d761d43 100644
--- a/docs/linkis-udf.md
+++ b/docs/configure/linkis-udf.md
@@ -1,7 +1,7 @@
-## linkis-udf 配置
+## linkis-udf configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|linkis-udf|wds.linkis.udf.hive.exec.path
|/appcom/Install/DataWorkCloudInstall/linkis-linkis-Udf-0.0.3-SNAPSHOT/lib/hive-exec-1.2.1.jar|udf.hive.exec.path|
|linkis-udf|wds.linkis.udf.tmp.path|/tmp/udf/|udf.tmp.path|
diff --git a/docs/pipeline.md b/docs/configure/pipeline.md
similarity index 79%
rename from docs/pipeline.md
rename to docs/configure/pipeline.md
index 03f1f1cdc..77dac53ce 100644
--- a/docs/pipeline.md
+++ b/docs/configure/pipeline.md
@@ -1,7 +1,7 @@
-## pipeline 配置
+## pipeline configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 |
+| Module Name (Service Name) | Parameter Name | Default Value | Description |
| -------- | -------- | ----- |----- |
|pipeline| pipeline.output.isoverwtite | true | isoverwtite |
|pipeline|pipeline.output.charset|UTF-8|charset|
diff --git a/docs/presto.md b/docs/configure/presto.md
similarity index 91%
rename from docs/presto.md
rename to docs/configure/presto.md
index fca90759a..bf2b8a871 100644
--- a/docs/presto.md
+++ b/docs/configure/presto.md
@@ -1,7 +1,7 @@
-## presto 配置
+## presto configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|presto|wds.linkis.engineconn.concurrent.limit|100|engineconn.concurrent.limit|
|presto|wds.linkis.entrance.max.job.instance|100|entrance.max.job.instance|
diff --git a/docs/python.md b/docs/configure/python.md
similarity index 75%
rename from docs/python.md
rename to docs/configure/python.md
index 5e3687377..12f1b6fb0 100644
--- a/docs/python.md
+++ b/docs/configure/python.md
@@ -1,7 +1,7 @@
-## python 配置
+## python configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|python|wds.linkis.python.line.limit|10|python.line.limit|
|python|wds.linkis.python.py4j.home |getPy4jHome |python.py4j.home|
diff --git a/docs/spark.md b/docs/configure/spark.md
similarity index 94%
rename from docs/spark.md
rename to docs/configure/spark.md
index 499064346..d58057f48 100644
--- a/docs/spark.md
+++ b/docs/configure/spark.md
@@ -1,7 +1,7 @@
-## spark 配置
+## spark configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|spark|linkis.bgservice.store.prefix|hdfs:///tmp/bdp-ide/|bgservice.store.prefix|
|spark|linkis.bgservice.store.suffix| |bgservice.store.suffix|
diff --git a/docs/sqoop.md b/docs/configure/sqoop.md
similarity index 88%
rename from docs/sqoop.md
rename to docs/configure/sqoop.md
index 85eaa87d9..2fb26da7e 100644
--- a/docs/sqoop.md
+++ b/docs/configure/sqoop.md
@@ -1,7 +1,7 @@
-## sqoop 配置
+## sqoop configure
-| 模块名(服务名) | 参数名 | 默认值 | 描述 | 是否引用|
+| Module Name (Service Name) | Parameter Name | Default Value | Description
|Used|
| -------- | -------- | ----- |----- | ----- |
|sqoop|wds.linkis.hadoop.site.xml
|core-site.xml;hdfs-site.xml;yarn-site.xml;mapred-site.xml| hadoop.site.xml|
|sqoop|sqoop.fetch.status.interval|5s |status.interval|
diff --git a/docs/index.md b/docs/index.md
index 28254c297..d28cbe7c5 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,9 @@
+EN:
This docs folder is only used to temporarily store some version documents.
For detailed documentation, please visit the official website
https://linkis.apache.org/docs/latest/introduction
------
+ZH:
这个docs文件夹，只是用来临时存放一些版本文档，
详细文档 请到官网查看 https://linkis.apache.org/zh-CN/docs/latest/introduction/
\ No newline at end of file
diff --git a/docs/info-1.1.3.md b/docs/info-1.1.3.md
deleted file mode 100644
index e0cdfc4e8..000000000
--- a/docs/info-1.1.3.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## 参数变化
-
-
-| 模块名(服务名)| 类型 | 参数名 | 默认值
| 描述 |
-| ----------- | ----- |
-------------------------------------------------------- | ---------------- |
------------------------------------------------------- |
-|ps-metadataquery | 修改 | wds.linkis.server.mdm.module.name<br/>-><br/>
linkis.server.mdq.module.name | metadataquery|元数据查询服务名|
-|ps-metadataquery | 修改 | wds.linkis.server.dsm.module.name<br/>-><br/>
linkis.server.dsm.module.name | data-source-manager|数据源管理服务名 |
diff --git a/linkis-dist/bin/checkEnv.sh b/linkis-dist/bin/checkEnv.sh
index 1acd53f98..eac903e1a 100644
--- a/linkis-dist/bin/checkEnv.sh
+++ b/linkis-dist/bin/checkEnv.sh
@@ -133,14 +133,6 @@ check_service_port
SERVER_PORT=$PUBLICSERVICE_PORT
check_service_port
-SERVER_PORT=$CS_PORT
-check_service_port
-
-SERVER_PORT=$DATASOURCE_MANAGER_PORT
-check_service_port
-
-SERVER_PORT=$METADATA_QUERY_PORT
-check_service_port
if [ "$portIsOccupy" = true ];then
echo "The port is already in use, please check before installing"
diff --git a/linkis-dist/bin/install.sh b/linkis-dist/bin/install.sh
index 4154d62bf..17aad08c3 100644
--- a/linkis-dist/bin/install.sh
+++ b/linkis-dist/bin/install.sh
@@ -386,44 +386,6 @@ then
sed -i ${txt}
"s#spring.server.port.*#spring.server.port=$PUBLICSERVICE_PORT#g"
$publicservice_conf
fi
-metadataquery_conf=$LINKIS_HOME/conf/linkis-ps-metadataquery.properties
-if [ "$METADATA_QUERY_PORT" != "" ]
-then
- sed -i ${txt}
"s#spring.server.port.*#spring.server.port=$METADATA_QUERY_PORT#g"
$metadataquery_conf
-fi
-
-
-##datasource
-datasource_conf=$LINKIS_HOME/conf/linkis-ps-data-source-manager.properties
-if [ "$DATASOURCE_MANAGER_PORT" != "" ]
-then
- sed -i ${txt}
"s#spring.server.port.*#spring.server.port=$DATASOURCE_MANAGER_PORT#g"
$datasource_conf
-fi
-
-echo "update conf $datasource_conf"
-if [ "$HIVE_META_URL" != "" ]
-then
- sed -i ${txt} "s#hive.meta.url.*#hive.meta.url=$HIVE_META_URL#g"
$datasource_conf
- sed -i ${txt} "s#hive.meta.url.*#hive.meta.url=$HIVE_META_URL#g"
$publicservice_conf
-fi
-if [ "$HIVE_META_USER" != "" ]
-then
- sed -i ${txt} "s#hive.meta.user.*#hive.meta.user=$HIVE_META_USER#g"
$datasource_conf
- sed -i ${txt} "s#hive.meta.user.*#hive.meta.user=$HIVE_META_USER#g"
$publicservice_conf
-fi
-if [ "$HIVE_META_PASSWORD" != "" ]
-then
- HIVE_META_PASSWORD=$(echo ${HIVE_META_PASSWORD//'#'/'\#'})
- sed -i ${txt}
"s#hive.meta.password.*#hive.meta.password=$HIVE_META_PASSWORD#g"
$datasource_conf
- sed -i ${txt}
"s#hive.meta.password.*#hive.meta.password=$HIVE_META_PASSWORD#g"
$publicservice_conf
-fi
-
-cs_conf=$LINKIS_HOME/conf/linkis-ps-cs.properties
-if [ "$CS_PORT" != "" ]
-then
- sed -i ${txt} "s#spring.server.port.*#spring.server.port=$CS_PORT#g"
$cs_conf
-fi
-
##Eanble prometheus for monitoring
if [ "true" == "$PROMETHEUS_ENABLE" ]
then
diff --git a/linkis-dist/deploy-config/linkis-env.sh
b/linkis-dist/deploy-config/linkis-env.sh
index 14242e1fc..588d1027d 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -137,19 +137,6 @@ ENTRANCE_PORT=9104
#PUBLICSERVICE_INSTALL_IP=127.0.0.1
PUBLICSERVICE_PORT=9105
-##linkis-ps-cs
-#CS_INSTALL_IP=127.0.0.1
-CS_PORT=9108
-
-
-##linkis-ps-data-source-manager
-#DATASOURCE_MANAGER_INSTALL_IP=127.0.0.1
-DATASOURCE_MANAGER_PORT=9109
-
-##linkis-ps-metadataquery
-#METADATA_QUERY_INSTALL_IP=127.0.0.1
-METADATA_QUERY_PORT=9110
-
########################################################################################
@@ -178,9 +165,6 @@ LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
##If you want to enable prometheus for monitoring linkis, you can set this
export PROMETHEUS_ENABLE=true
export PROMETHEUS_ENABLE=false
-#If you want to start metadata related microservices, you can set this export
ENABLE_METADATA_MANAGE=true
-export ENABLE_METADATA_QUERY=true
-
#If you only want to experience linkis streamlined services, not rely on hdfs
#you can set the following configuration to false and for the configuration
related to the file directory,
#use path mode of [file://] to replace [hdfs://]
diff --git a/linkis-dist/docker/ldh.Dockerfile
b/linkis-dist/docker/ldh.Dockerfile
index c5513a28c..3b2073f29 100644
--- a/linkis-dist/docker/ldh.Dockerfile
+++ b/linkis-dist/docker/ldh.Dockerfile
@@ -81,11 +81,8 @@ RUN mkdir -p /etc/ldh \
&& ln -s
/opt/ldh/${LINKIS_VERSION}/apache-zookeeper-${ZOOKEEPER_VERSION}-bin
/opt/ldh/current/zookeeper
# after create soft link
-ADD ldh-tars/mysql-connector-java-${MYSQL_JDBC_VERSION}.jar
/opt/ldh/current/hive/lib/
-ADD ldh-tars/mysql-connector-java-${MYSQL_JDBC_VERSION}.jar
/opt/ldh/current/spark/jars/
-
-
-
+#ADD ldh-tars/mysql-connector-java-${MYSQL_JDBC_VERSION}.jar
/opt/ldh/current/hive/lib/
+#ADD ldh-tars/mysql-connector-java-${MYSQL_JDBC_VERSION}.jar
/opt/ldh/current/spark/jars/
ENV JAVA_HOME /etc/alternatives/jre
ENV PATH
/opt/ldh/current/hadoop/bin:/opt/ldh/current/hive/bin:/opt/ldh/current/spark/bin:/opt/ldh/current/flink/bin:/opt/ldh/current/zookeeper/bin:$PATH
diff --git a/linkis-dist/docker/scripts/entry-point-ldh.sh
b/linkis-dist/docker/scripts/entry-point-ldh.sh
index 55653d79c..554c45d7b 100644
--- a/linkis-dist/docker/scripts/entry-point-ldh.sh
+++ b/linkis-dist/docker/scripts/entry-point-ldh.sh
@@ -36,6 +36,16 @@ hdfs dfs -mkdir -p /completed-jobs
hdfs dfs -chmod -R 777 /completed-jobs
hdfs dfs -chmod 777 /
+#copy mysql-connector-java-*.jar from shared directory
+mysql_connector_jar_path=/opt/ldh/current/hive/lib/mysql-connector-java-*.jar
+jar_files=$(ls $mysql_connector_jar_path 2> /dev/null | wc -l);
+
+if [ "$jar_files" == "0" ] ;then #if not exist
+ echo "try to copy mysql-connector-java-*.jar to /opt/ldh/current/hive/lib/
and /opt/ldh/current/spark/jars/"
+ cp /opt/common/extendlib/mysql-connector-java-*.jar
/opt/ldh/current/hive/lib/
+ cp /opt/common/extendlib/mysql-connector-java-*.jar
/opt/ldh/current/spark/jars/
+fi
+
# - hive
/opt/ldh/current/hive/bin/schematool -initSchema -dbType mysql
diff --git a/linkis-dist/docker/scripts/prepare-ldh-image.sh
b/linkis-dist/docker/scripts/prepare-ldh-image.sh
index 44623a426..047c64710 100755
--- a/linkis-dist/docker/scripts/prepare-ldh-image.sh
+++ b/linkis-dist/docker/scripts/prepare-ldh-image.sh
@@ -27,7 +27,6 @@ rm -rf ${LDH_TAR_DIR} && mkdir -p ${LDH_TAR_DIR}
rm -rf ${PROJECT_TARGET}/entry-point-ldh.sh
cp ${WORK_DIR}/entry-point-ldh.sh ${PROJECT_TARGET}/
-MYSQL_VERSION=${MYSQL_VERSION:-5.7}
HADOOP_VERSION=${HADOOP_VERSION:-2.7.2}
HIVE_VERSION=${HIVE_VERSION:-2.3.3}
SPARK_VERSION=${SPARK_VERSION:-2.4.3}
@@ -64,4 +63,5 @@ download ${DOWNLOAD_URL_HIVE} ${TARFILENAME_HIVE}
${LDH_TAR_DIR}
download ${DOWNLOAD_URL_SPARK} ${TARFILENAME_SPARK} ${LDH_TAR_DIR}
download ${DOWNLOAD_URL_FLINK} ${TARFILENAME_FLINK} ${LDH_TAR_DIR}
download ${DOWNLOAD_URL_ZOOKEEPER} ${TARFILENAME_ZOOKEEPER} ${LDH_TAR_DIR}
-download ${DOWNLOAD_URL_MYSQL_JDBC} ${TARFILENAME_MYSQL_JDBC} ${LDH_TAR_DIR}
\ No newline at end of file
+
+#download ${DOWNLOAD_URL_MYSQL_JDBC} ${TARFILENAME_MYSQL_JDBC} ${LDH_TAR_DIR}
\ No newline at end of file
diff --git a/linkis-dist/helm/scripts/resources/ldh/ldh.yaml
b/linkis-dist/helm/scripts/resources/ldh/ldh.yaml
index 52eab4af4..fec83e521 100644
--- a/linkis-dist/helm/scripts/resources/ldh/ldh.yaml
+++ b/linkis-dist/helm/scripts/resources/ldh/ldh.yaml
@@ -111,6 +111,10 @@ spec:
sources:
- configMap:
name: zookeeper-conf
+ - name: mysql-jar
+ hostPath:
+ path: /opt/common/extendlib
+ type: DirectoryOrCreate
containers:
- name: ldh
image: linkis-ldh:${LDH_VERSION}
@@ -172,3 +176,5 @@ spec:
mountPath: /etc/ldh/flink
- name: zookeeper-conf
mountPath: /etc/ldh/zookeeper
+ - name: mysql-jar
+ mountPath: /opt/common/extendlib
diff --git a/linkis-dist/package/sbin/graceful-upgrade.sh
b/linkis-dist/package/sbin/graceful-upgrade.sh
index 233d86fb5..a155460d7 100644
--- a/linkis-dist/package/sbin/graceful-upgrade.sh
+++ b/linkis-dist/package/sbin/graceful-upgrade.sh
@@ -45,9 +45,6 @@ function getPort(){
"cg-linkismanager")
export SERVER_PORT=$MANAGER_PORT
;;
- "ps-cs")
- export SERVER_PORT=$CS_PORT
- ;;
"cg-engineconnmanager")
export SERVER_PORT=$ENGINECONNMANAGER_PORT
;;
@@ -57,12 +54,6 @@ function getPort(){
"cg-engineplugin")
export SERVER_PORT=$ENGINECONN_PLUGIN_SERVER_PORT
;;
- "ps-data-source-manager")
- export SERVER_PORT=$DATASOURCE_MANAGER_PORT
- ;;
- "ps-metadataquery")
- export SERVER_PORT=$METADATA_QUERY_PORT
- ;;
esac
}
diff --git a/linkis-dist/package/sbin/linkis-start-all.sh
b/linkis-dist/package/sbin/linkis-start-all.sh
index 7f83581f1..f0a3707ea 100644
--- a/linkis-dist/package/sbin/linkis-start-all.sh
+++ b/linkis-dist/package/sbin/linkis-start-all.sh
@@ -82,7 +82,7 @@ SERVER_NAME="cg-linkismanager"
SERVER_IP=$MANAGER_INSTALL_IP
startApp
-sleep 15
+sleep 20
#linkis-cg-entrance
SERVER_NAME="cg-entrance"
@@ -166,4 +166,4 @@ SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
checkServer
-echo "Linkis started successfully"
+echo "Apache Linkis started successfully"
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
index 332b6672c..d5c8f6a04 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
@@ -52,7 +52,8 @@ public class MetaClassLoaderManager {
public static CommonVars<String> LIB_DIR =
CommonVars.apply(
"wds.linkis.server.mdm.service.lib.dir",
- Configuration.getLinkisHome() +
"/lib/linkis-public-enhancements/metadataquery-service");
+ Configuration.getLinkisHome()
+ +
"/lib/linkis-public-enhancements/linkis-ps-publicservice/metadataquery-service");
public static CommonVars<Integer> INSTANCE_EXPIRE_TIME =
CommonVars.apply("wds.linkis.server.mdm.service.instance.expire-in-seconds",
60);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
![https://img.shields.io/badge/JDK-8-green.svg"](https://img.shields.io/badge/JDK-8-green.svg"){kind=link}
![https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg"](https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg"){kind=link}
![https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg"](https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg"){kind=link}