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/04/06 01:52:50 UTC
[incubator-linkis] branch dev-1.1.2 updated: Add switch to RPC support ribbon parameter #1904 (#1905)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 348ee72a5 Add switch to RPC support ribbon parameter #1904 (#1905)
348ee72a5 is described below
commit 348ee72a5846db8938c6bfb21bae987999ea07e3
Author: peacewong <wp...@gmail.com>
AuthorDate: Wed Apr 6 09:52:45 2022 +0800
Add switch to RPC support ribbon parameter #1904 (#1905)
---
.../src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala | 2 ++
.../main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
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 d5437487b..fafc5a2f4 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
@@ -50,6 +50,8 @@ object RPCConfiguration {
val SERVICE_SCAN_PACKAGE = CommonVars("wds.linkis.ms.service.scan.package", "org.apache.linkis").getValue
+ val ENABLE_SPRING_PARAMS = CommonVars("wds.linkis.rpc.spring.params.enable", false).getValue
+
val REFLECTIONS = new Reflections(SERVICE_SCAN_PACKAGE, new MethodAnnotationsScanner(), new TypeAnnotationsScanner(), new SubTypesScanner())
}
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
index fcf7f55e5..88ddce15f 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
@@ -30,6 +30,7 @@ import org.apache.linkis.rpc.{BaseRPCSender, RPCMessageEvent, RPCSpringBeanCache
import org.apache.linkis.server.{BDPJettyServerHelper, Message}
import feign._
import org.apache.commons.lang.StringUtils
+import org.apache.linkis.rpc.conf.RPCConfiguration
import org.apache.linkis.rpc.message.utils.LoadBalancerOptionsUtils
import org.springframework.cloud.netflix.ribbon.ServerIntrospector
import org.springframework.cloud.openfeign.ribbon.{CachingSpringLoadBalancerFactory, FeignLoadBalancer, LoadBalancerFeignClient}
@@ -78,7 +79,9 @@ private[rpc] class SpringMVCRPCSender private[rpc](private[rpc] val serviceInsta
}
}
}, getClientFactory)
- builder.options(LoadBalancerOptionsUtils.getDefaultOptions)
+ if (RPCConfiguration.ENABLE_SPRING_PARAMS) {
+ builder.options(LoadBalancerOptionsUtils.getDefaultOptions)
+ }
super.doBuilder(builder)
builder.contract(getContract)
.encoder(getEncoder).decoder(getDecoder)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org