This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 0b06dd681 feat(linkis-dist): add hadoop version control in install.sh
(#3729)
0b06dd681 is described below
commit 0b06dd6815e703756a4d82573a56a0cbbf05b489
Author: Hunter <[email protected]>
AuthorDate: Sat Oct 29 22:33:05 2022 +0800
feat(linkis-dist): add hadoop version control in install.sh (#3729)
* feat(linkis-dist): add hadoop version control in install.sh
---
linkis-dist/bin/install.sh | 5 +++++
linkis-dist/deploy-config/linkis-env.sh | 3 +++
linkis-dist/package/db/linkis_dml.sql | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/linkis-dist/bin/install.sh b/linkis-dist/bin/install.sh
index 5b4f28cf1..9daf33880 100644
--- a/linkis-dist/bin/install.sh
+++ b/linkis-dist/bin/install.sh
@@ -188,6 +188,11 @@ then
sed -i ${txt} "s#@YARN_RESTFUL_URL#$YARN_RESTFUL_URL#g"
$LINKIS_HOME/db/linkis_dml.sql
fi
+if [ "$HADOOP_VERSION" != "" ]
+then
+ sed -i ${txt} "s#@HADOOP_VERSION#$HADOOP_VERSION#g"
$LINKIS_HOME/db/linkis_dml.sql
+fi
+
if [ "$YARN_AUTH_ENABLE" != "" ]
then
sed -i ${txt} "s#@YARN_AUTH_ENABLE#$YARN_AUTH_ENABLE#g"
$LINKIS_HOME/db/linkis_dml.sql
diff --git a/linkis-dist/deploy-config/linkis-env.sh
b/linkis-dist/deploy-config/linkis-env.sh
index c5888ef63..85d954fd9 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -96,6 +96,9 @@ SPARK_CONF_DIR=/appcom/config/spark-config
#PYTHON_VERSION=python2
+## Hadoop env version
+HADOOP_VERSION=2.7.2
+
################### The install Configuration of all Micro-Services
#####################
#
# NOTICE:
diff --git a/linkis-dist/package/db/linkis_dml.sql
b/linkis-dist/package/db/linkis_dml.sql
index b2472e81a..7265c8179 100644
--- a/linkis-dist/package/db/linkis_dml.sql
+++ b/linkis-dist/package/db/linkis_dml.sql
@@ -276,7 +276,7 @@ insert into `linkis_ps_configuration_config_value`
(`config_key_id`, `config_val
INNER JOIN linkis_cg_manager_label label ON relation.engine_type_label_id =
label.id AND label.label_value = @OPENLOOKENG_ALL);
insert into
`linkis_cg_rm_external_resource_provider`(`id`,`resource_type`,`name`,`labels`,`config`)
values
-(1,'Yarn','default',NULL,'{\r\n\"rmWebAddress\":
\"@YARN_RESTFUL_URL\",\r\n\"hadoopVersion\":
\"2.7.2\",\r\n\"authorEnable\":@YARN_AUTH_ENABLE,\r\n\"user\":\"@YARN_AUTH_USER\",\r\n\"pwd\":\"@YARN_AUTH_PWD\",\r\n\"kerberosEnable\":@YARN_KERBEROS_ENABLE,\r\n\"principalName\":\"@YARN_PRINCIPAL_NAME\",\r\n\"keytabPath\":\"@YARN_KEYTAB_PATH\",\r\n\"krb5Path\":\"@YARN_KRB5_PATH\"\r\n}');
+(1,'Yarn','default',NULL,'{\r\n\"rmWebAddress\":
\"@YARN_RESTFUL_URL\",\r\n\"hadoopVersion\":
\"@HADOOP_VERSION\",\r\n\"authorEnable\":@YARN_AUTH_ENABLE,\r\n\"user\":\"@YARN_AUTH_USER\",\r\n\"pwd\":\"@YARN_AUTH_PWD\",\r\n\"kerberosEnable\":@YARN_KERBEROS_ENABLE,\r\n\"principalName\":\"@YARN_PRINCIPAL_NAME\",\r\n\"keytabPath\":\"@YARN_KEYTAB_PATH\",\r\n\"krb5Path\":\"@YARN_KRB5_PATH\"\r\n}');
-- errorcode
-- 01 linkis server
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
