This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 5bf4d705c [Feat]add service version in eureka metadata (#4081)
5bf4d705c is described below
commit 5bf4d705cc70db0e102deddb5f935d10fd9912f8
Author: GuoPhilipse <[email protected]>
AuthorDate: Tue Jan 31 12:09:44 2023 +0800
[Feat]add service version in eureka metadata (#4081)
* add service version in eureka metadata
* use env version
* add eureka meta verion info
* fix meta name
* init linkis conf version
---------
Co-authored-by: gf13871 <[email protected]>
---
linkis-dist/bin/install.sh | 16 +++++++++++++++-
linkis-dist/package/conf/application-eureka.yml | 1 +
linkis-dist/package/conf/application-linkis.yml | 1 +
.../package/conf/linkis-cg-engineconnmanager.properties | 5 ++++-
linkis-dist/package/conf/linkis-cg-entrance.properties | 6 ++++--
.../package/conf/linkis-cg-linkismanager.properties | 5 ++++-
linkis-dist/package/conf/linkis-mg-gateway.properties | 5 ++++-
.../package/conf/linkis-ps-publicservice.properties | 3 +++
8 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/linkis-dist/bin/install.sh b/linkis-dist/bin/install.sh
index 9daf33880..fa6d18cba 100644
--- a/linkis-dist/bin/install.sh
+++ b/linkis-dist/bin/install.sh
@@ -291,12 +291,16 @@ then
export GATEWAY_INSTALL_IP=$SERVER_IP
fi
+currentTime=`date +%Y%m%d%H%M%S`
+
##eureka
sed -i ${txt} "s#defaultZone:.*#defaultZone: $EUREKA_URL#g"
$LINKIS_HOME/conf/application-eureka.yml
sed -i ${txt} "s#port:.*#port: $EUREKA_PORT#g"
$LINKIS_HOME/conf/application-eureka.yml
+sed -i ${txt} "s#linkis.app.version:.*#linkis.app.version:
$LINKIS_VERSION-$currentTime#g" $LINKIS_HOME/conf/application-eureka.yml
##server application.yml
sed -i ${txt} "s#defaultZone:.*#defaultZone: $EUREKA_URL#g"
$LINKIS_HOME/conf/application-linkis.yml
+sed -i ${txt} "s#linkis.app.version:.*#linkis.app.version:
$LINKIS_VERSION-$currentTime#g" $LINKIS_HOME/conf/application-linkis.yml
echo "update conf $common_conf"
sed -i ${txt}
"s#wds.linkis.server.version.*#wds.linkis.server.version=$LINKIS_SERVER_VERSION#g"
$common_conf
@@ -338,17 +342,19 @@ sed -i ${txt}
"s#wds.linkis.ldap.proxy.baseDN.*#wds.linkis.ldap.proxy.baseDN=$L
sed -i ${txt}
"s#wds.linkis.ldap.proxy.userNameFormat.*#wds.linkis.ldap.proxy.userNameFormat=$LDAP_USER_NAME_FORMAT#g"
$gateway_conf
sed -i ${txt} "s#wds.linkis.admin.user.*#wds.linkis.admin.user=$deployUser#g"
$gateway_conf
sed -i ${txt}
"s#\#wds.linkis.admin.password.*#wds.linkis.admin.password=$deployPwd#g"
$gateway_conf
+
if [ "$GATEWAY_PORT" != "" ]
then
sed -i ${txt} "s#spring.server.port.*#spring.server.port=$GATEWAY_PORT#g"
$gateway_conf
fi
-
+sed -i ${txt}
"s#spring.eureka.instance.metadata-map.linkis.conf.version.*#spring.eureka.instance.metadata-map.linkis.conf.version=$LINKIS_VERSION-$currentTime#g"
$gateway_conf
manager_conf=$LINKIS_HOME/conf/linkis-cg-linkismanager.properties
if [ "$MANAGER_PORT" != "" ]
then
sed -i ${txt} "s#spring.server.port.*#spring.server.port=$MANAGER_PORT#g"
$manager_conf
fi
+sed -i ${txt}
"s#spring.eureka.instance.metadata-map.linkis.conf.version.*#spring.eureka.instance.metadata-map.linkis.conf.version=$LINKIS_VERSION-$currentTime#g"
$manager_conf
# ecm install
ecm_conf=$LINKIS_HOME/conf/linkis-cg-engineconnmanager.properties
@@ -356,6 +362,7 @@ if test -z $ENGINECONN_ROOT_PATH
then
ENGINECONN_ROOT_PATH=$LINKIS_HOME/engineroot
fi
+
sed -i ${txt}
"s#wds.linkis.engineconn.root.dir.*#wds.linkis.engineconn.root.dir=$ENGINECONN_ROOT_PATH#g"
$ecm_conf
if [ ! -d $ENGINECONN_ROOT_PATH ] ;then
@@ -369,11 +376,16 @@ then
sed -i ${txt}
"s#spring.server.port.*#spring.server.port=$ENGINECONNMANAGER_PORT#g" $ecm_conf
fi
+sed -i ${txt}
"s#spring.eureka.instance.metadata-map.linkis.conf.version.*#spring.eureka.instance.metadata-map.linkis.conf.version=$LINKIS_VERSION-$currentTime#g"
$ecm_conf
+
entrance_conf=$LINKIS_HOME/conf/linkis-cg-entrance.properties
if [ "$ENTRANCE_PORT" != "" ]
then
sed -i ${txt} "s#spring.server.port.*#spring.server.port=$ENTRANCE_PORT#g"
$entrance_conf
fi
+
+sed -i ${txt}
"s#spring.eureka.instance.metadata-map.linkis.conf.version.*#spring.eureka.instance.metadata-map.linkis.conf.version=$LINKIS_VERSION-$currentTime#g"
$entrance_conf
+
if [ "$RESULT_SET_ROOT_PATH" != "" ]
then
sed -i ${txt}
"s#wds.linkis.resultSet.store.path.*#wds.linkis.resultSet.store.path=$RESULT_SET_ROOT_PATH#g"
$entrance_conf
@@ -385,6 +397,8 @@ then
sed -i ${txt}
"s#spring.server.port.*#spring.server.port=$PUBLICSERVICE_PORT#g"
$publicservice_conf
fi
+sed -i ${txt}
"s#spring.eureka.instance.metadata-map.linkis.conf.version.*#spring.eureka.instance.metadata-map.linkis.conf.version=$LINKIS_VERSION-$currentTime#g"
$publicservice_conf
+
echo "update conf $publicservice_conf"
if [ "$HIVE_META_URL" != "" ]
then
diff --git a/linkis-dist/package/conf/application-eureka.yml
b/linkis-dist/package/conf/application-eureka.yml
index 3e53e5245..6dcb6c537 100644
--- a/linkis-dist/package/conf/application-eureka.yml
+++ b/linkis-dist/package/conf/application-eureka.yml
@@ -25,6 +25,7 @@ eureka:
instance:
metadata-map:
prometheus.path: ${prometheus.path:/actuator/prometheus}
+ linkis.app.version: ${linkis.app.version}
hostname:
# preferIpAddress: true
client:
diff --git a/linkis-dist/package/conf/application-linkis.yml
b/linkis-dist/package/conf/application-linkis.yml
index a39c9d999..8e9956ab2 100644
--- a/linkis-dist/package/conf/application-linkis.yml
+++ b/linkis-dist/package/conf/application-linkis.yml
@@ -17,6 +17,7 @@ eureka:
instance:
metadata-map:
prometheus.path: ${prometheus.path:${prometheus.endpoint}}
+ linkis.app.version: ${linkis.app.version}
client:
serviceUrl:
defaultZone: http://127.0.0.1:20303/eureka/
diff --git a/linkis-dist/package/conf/linkis-cg-engineconnmanager.properties
b/linkis-dist/package/conf/linkis-cg-engineconnmanager.properties
index 8189cc8df..0cd9a59fd 100644
--- a/linkis-dist/package/conf/linkis-cg-engineconnmanager.properties
+++ b/linkis-dist/package/conf/linkis-cg-engineconnmanager.properties
@@ -20,4 +20,7 @@ wds.linkis.engineconn.root.dir=/appcom/tmp
##Spring
spring.server.port=9102
##set engine environment in econn start script, such as SPARK3_HOME,the value
of env will read from ecm host by key.
-#wds.linkis.engineconn.env.keys=SPARK3_HOME,
\ No newline at end of file
+#wds.linkis.engineconn.env.keys=SPARK3_HOME,
+
+## you may set service version if you want to distinguish different
configuration version
+spring.eureka.instance.metadata-map.linkis.conf.version=v1
\ No newline at end of file
diff --git a/linkis-dist/package/conf/linkis-cg-entrance.properties
b/linkis-dist/package/conf/linkis-cg-entrance.properties
index faeeb2059..e89ced215 100644
--- a/linkis-dist/package/conf/linkis-cg-entrance.properties
+++ b/linkis-dist/package/conf/linkis-cg-entrance.properties
@@ -28,7 +28,9 @@
wds.linkis.server.user.restful.uri.pass.auth=/actuator/prometheus,/api/rest_j/v1
## enable variable operation default vaule false
# wds.linkis.variable.operation=true
-
##Spring
spring.server.port=9104
-wds.linkis.entrance.user.creator.ip.interceptor.switch=false
\ No newline at end of file
+wds.linkis.entrance.user.creator.ip.interceptor.switch=false
+
+## you may set service version if you want to distinguish different
configuration version
+spring.eureka.instance.metadata-map.linkis.conf.version=v1
\ No newline at end of file
diff --git a/linkis-dist/package/conf/linkis-cg-linkismanager.properties
b/linkis-dist/package/conf/linkis-cg-linkismanager.properties
index 5755b4c63..988a1f414 100644
--- a/linkis-dist/package/conf/linkis-cg-linkismanager.properties
+++ b/linkis-dist/package/conf/linkis-cg-linkismanager.properties
@@ -26,4 +26,7 @@ wds.linkis.engineConn.dist.load.enable=true
#wds.linkis.engineconn.plugin.loader.store.path=/appcom/Install/LinkisInstall/lib/linkis-engineconn-plugins
##Spring
-spring.server.port=9101
\ No newline at end of file
+spring.server.port=9101
+
+## you may set service version if you want to distinguish different
configuration version
+spring.eureka.instance.metadata-map.linkis.conf.version=v1
\ No newline at end of file
diff --git a/linkis-dist/package/conf/linkis-mg-gateway.properties
b/linkis-dist/package/conf/linkis-mg-gateway.properties
index 8e02e6431..84be3d897 100644
--- a/linkis-dist/package/conf/linkis-mg-gateway.properties
+++ b/linkis-dist/package/conf/linkis-mg-gateway.properties
@@ -34,4 +34,7 @@ wds.linkis.admin.user=hadoop
##Spring
spring.server.port=9001
-wds.linkis.server.component.exclude.classes=org.apache.linkis.server.Knife4jConfig
\ No newline at end of file
+wds.linkis.server.component.exclude.classes=org.apache.linkis.server.Knife4jConfig
+
+## you may set service version if you want to distinguish different
configuration version
+spring.eureka.instance.metadata-map.linkis.conf.version=v1
\ No newline at end of file
diff --git a/linkis-dist/package/conf/linkis-ps-publicservice.properties
b/linkis-dist/package/conf/linkis-ps-publicservice.properties
index 797bb9188..3898468aa 100644
--- a/linkis-dist/package/conf/linkis-ps-publicservice.properties
+++ b/linkis-dist/package/conf/linkis-ps-publicservice.properties
@@ -48,3 +48,6 @@ spring.spring.main.allow-bean-definition-overriding=true
spring.spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
# ps-cs prefix must be started with 'cs_'
spring.eureka.instance.metadata-map.route=cs_1_dev
+
+## you may set service version if you want to distinguish different
configuration version
+spring.eureka.instance.metadata-map.linkis.conf.version=v1
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
