You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/08/29 03:15:18 UTC
[incubator-linkis] 01/02: fix(ps-cs): fix the ps-cs lable not regiter
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
commit 30bb668844fbf94debae8d8ccdc978a04cc40fdb
Author: Jack Xu <xu...@126.com>
AuthorDate: Sun Aug 28 04:55:26 2022 +0800
fix(ps-cs): fix the ps-cs lable not regiter
---
linkis-dist/package/conf/linkis-ps-publicservice.properties | 3 +++
.../ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala | 3 ++-
.../linkis/instance/label/client/EurekaInstanceLabelClient.scala | 5 +++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/linkis-dist/package/conf/linkis-ps-publicservice.properties b/linkis-dist/package/conf/linkis-ps-publicservice.properties
index 4b32b47ff..76abb0fe9 100644
--- a/linkis-dist/package/conf/linkis-ps-publicservice.properties
+++ b/linkis-dist/package/conf/linkis-ps-publicservice.properties
@@ -39,6 +39,9 @@ wds.linkis.metadata.hive.encode.enabled=false
#wds.linkis.jobhistory.undone.job.refreshtime.daily=00:15
wds.linkis.cs.deserialize.replace_package_header.enable=false
+wds.linkis.rpc.conf.enable.local.message=true
+wds.linkis.rpc.conf.local.app.list=linkis-ps-publicservice
+
##Spring
spring.server.port=9105
spring.spring.main.allow-bean-definition-overriding=true
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
index 25af4d6c2..65edee2ea 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala
@@ -105,8 +105,9 @@ class RouteLabelInstanceAliasConverter extends InstanceAliasConverter with Loggi
}
if (routeLabels.size >= 1) {
val alias = routeLabels.head.getStringValue
+ logger.info(s"alias for instance : ${instance} is $alias")
insAliasCache.put(instance, alias)
- routeLabels.head.getStringValue
+ alias
} else {
val msg = s"No routeLabel got for instance : ${instance}"
logger.error(msg)
diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
index 89735aaeb..ca49bc34c 100644
--- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
+++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/EurekaInstanceLabelClient.scala
@@ -42,10 +42,11 @@ class EurekaInstanceLabelClient extends Logging {
@Autowired
private var registration: Registration = _
- @EventListener
+ @EventListener(classes = Array(classOf[AvailabilityChangeEvent[AvailabilityState]]))
def init(availabilityChangeEvent: AvailabilityChangeEvent[AvailabilityState]): Unit = {
+ logger.info(s"EurekaInstanceLabelClient app state ${availabilityChangeEvent.getState}")
availabilityChangeEvent.getState match {
- case state: ReadinessState if state.equals(ReadinessState.ACCEPTING_TRAFFIC) =>
+ case state: ReadinessState if state == ReadinessState.ACCEPTING_TRAFFIC =>
logger.info("EurekaInstanceLabelClient init")
val metadata = registration.getMetadata
if (
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org