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:19 UTC
[incubator-linkis] 02/02: fix: fix the cs-server find serviceId return null bug
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