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:17 UTC
[incubator-linkis] branch dev-1.3.0 updated (374e48098 -> 12b213f11)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from 374e48098 Merge pull request #3092 from WeDataSphere/dev-1.3.0-merge-master
new 30bb66884 fix(ps-cs): fix the ps-cs lable not regiter
new 12b213f11 fix: fix the cs-server find serviceId return null bug
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala | 12 ++++++++++++
linkis-dist/package/conf/linkis-ps-publicservice.properties | 3 +++
.../ha/instancealias/impl/InstanceAliasManagerImpl.scala | 10 +++++-----
.../impl/RouteLabelInstanceAliasConverter.scala | 3 ++-
.../instance/label/client/EurekaInstanceLabelClient.scala | 5 +++--
.../linkis/gateway/ujes/route/HaContextGatewayRouter.scala | 12 +++++++-----
6 files changed, 32 insertions(+), 13 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/02: fix: fix the cs-server find serviceId return null bug
Posted by pe...@apache.org.
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 12b213f11beea9da12fcefa3d74b8262fd180ba7
Author: Jack Xu <xu...@126.com>
AuthorDate: Sun Aug 28 23:53:11 2022 +0800
fix: fix the cs-server find serviceId return null bug
---
.../scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala | 12 ++++++++++++
.../ha/instancealias/impl/InstanceAliasManagerImpl.scala | 10 +++++-----
.../linkis/gateway/ujes/route/HaContextGatewayRouter.scala | 12 +++++++-----
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
index f7aff2442..e712f273c 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
@@ -105,4 +105,16 @@ object RPCConfiguration {
val BDP_RPC_CACHE_CONF_EXPIRE_TIME: CommonVars[Long] =
CommonVars("wds.linkis.rpc.cache.expire.time", 120000L)
+ val CONTEXT_SERVICE_REQUEST_PREFIX = "contextservice"
+
+ val CONTEXT_SERVICE_NAME: String =
+ if (
+ ENABLE_PUBLIC_SERVICE.getValue && PUBLIC_SERVICE_LIST
+ .exists(_.equalsIgnoreCase(CONTEXT_SERVICE_REQUEST_PREFIX))
+ ) {
+ PUBLIC_SERVICE_APPLICATION_NAME.getValue
+ } else {
+ CONTEXT_SERVICE_APPLICATION_NAME.getValue
+ }
+
}
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
index b29f4a63a..1f128e056 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
@Component
class InstanceAliasManagerImpl extends InstanceAliasManager with Logging {
@@ -69,17 +69,17 @@ class InstanceAliasManagerImpl extends InstanceAliasManager with Logging {
def getContextServiceID(): String = {
RPCUtils
.findService(
- RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue,
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
list => {
val services =
- list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue))
+ list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
services.headOption
}
)
.getOrElse(null)
}
- @Deprecated
+ @deprecated
override def refresh(): Unit = {}
override def getAllInstanceList(): util.List[ServiceInstance] = {
@@ -87,7 +87,7 @@ class InstanceAliasManagerImpl extends InstanceAliasManager with Logging {
if (null == serviceID) {
return new util.ArrayList[ServiceInstance](0)
}
- serverLoader.getServiceInstances(serviceID).toList
+ serverLoader.getServiceInstances(serviceID).toList.asJava
}
override def isInstanceAliasValid(alias: String): Boolean = {
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
index f7c526dbb..c46ee3922 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala
@@ -95,9 +95,9 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
def dealContextCreate(gatewayContext: GatewayContext): ServiceInstance = {
val serviceId = findService(
- HaContextGatewayRouter.CONTEXT_SERVICE_NAME,
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
list => {
- val services = list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_NAME))
+ val services = list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
services.headOption
}
)
@@ -135,9 +135,9 @@ class HaContextGatewayRouter extends AbstractGatewayRouter {
val instances = contextIDParser.parse(contextId)
var serviceId: Option[String] = None
serviceId = findService(
- HaContextGatewayRouter.CONTEXT_SERVICE_NAME,
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
list => {
- val services = list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_NAME))
+ val services = list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
services.headOption
}
)
@@ -159,12 +159,14 @@ object HaContextGatewayRouter {
val CONTEXT_ID_STR: String = "contextId"
+ @deprecated("please use RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX")
val CONTEXT_SERVICE_REQUEST_PREFIX = "contextservice"
+ @deprecated("please use RPCConfiguration.CONTEXT_SERVICE_NAME")
val CONTEXT_SERVICE_NAME: String =
if (
RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue && RPCConfiguration.PUBLIC_SERVICE_LIST
- .exists(_.equalsIgnoreCase(CONTEXT_SERVICE_REQUEST_PREFIX))
+ .exists(_.equalsIgnoreCase(RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX))
) {
RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/02: fix(ps-cs): fix the ps-cs lable not regiter
Posted by pe...@apache.org.
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