This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-linkis-website.git
The following commit(s) were added to refs/heads/dev by this push:
new 230ebe76a5 feat: add service merge doc (#531)
230ebe76a5 is described below
commit 230ebe76a5443b3442e1055e5d170528588cf7f7
Author: aiceflower <[email protected]>
AuthorDate: Thu Oct 13 17:20:56 2022 +0800
feat: add service merge doc (#531)
* add linkis 1.3.0 service merge doc
---
blog/2022-10-09-linkis-service-merge.md | 362 +++++++++++++++++++++
blog/authors.yml | 6 +
.../2022-10-09-linkis-service-merge.md | 362 +++++++++++++++++++++
.../docusaurus-plugin-content-blog/authors.yml | 9 +-
4 files changed, 738 insertions(+), 1 deletion(-)
diff --git a/blog/2022-10-09-linkis-service-merge.md
b/blog/2022-10-09-linkis-service-merge.md
new file mode 100644
index 0000000000..f3eb950314
--- /dev/null
+++ b/blog/2022-10-09-linkis-service-merge.md
@@ -0,0 +1,362 @@
+---
+title: Apache Linkis1.3.0 Service Merge
+authors: [aiceflower]
+tags: [blog,linki1.3.0,service merge]
+---
+### Foreword
+
+With the development of business and the update and iteration of community
products, we found that Linkis1 There are too many .X services, and services
can be merged appropriately to reduce the number of services and facilitate
deployment and debugging. At present, Linkis services are mainly divided into
three categories, including computing governance services (CG:
entrance/ecp/ecm/linkismanager), public enhancement services (PS:
publicservice/datasource/cs) and microservice governance [...]
+
+### Service merge changes
+
+The main changes of this service merge are as follows:
+
+- Support Restful service forwarding: The modification point is mainly the
forwarding logic of Gateway, similar to the current publicservice service merge
parameter: wds.linkis.gateway.conf.publicservice.list
+- Support Change the remote call of the RPC service to a local call, similar
to LocalMessageSender, and now it is possible to complete the return of the
local call by changing the Sender
+- Configuration file changes
+- Service start and stop script changes
+
+### To be achieved
+
+- Basic goal: merge PS services into one service
+- Basic goal: merge CG service into CG-Service and ECM
+- Advanced goal: merge CG services into one server
+- Final goal: remove eureka, gateway into single service
+
+
+### Specific changes
+
+#### Gateway changes
(org.apache.linkis.gateway.ujes.route.HaContextGatewayRouter)
+
+```scala
+//Override before changing
+def route(gatewayContext: GatewayContext): ServiceInstance = {
+
+ if
(gatewayContext.getGatewayRoute.getRequestURI.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR)
||
+
gatewayContext.getGatewayRoute.getRequestURI.contains(HaContextGatewayRouter.OLD_CONTEXT_SERVICE_PREFIX)){
+ val params: util.HashMap[String, String] =
gatewayContext.getGatewayRoute.getParams
+ if (!gatewayContext.getRequest.getQueryParams.isEmpty) {
+ for ((k, vArr) <- gatewayContext.getRequest.getQueryParams) {
+ if (vArr.nonEmpty) {
+ params.putIfAbsent(k, vArr.head)
+ }
+ }
+ }
+ if
(gatewayContext.getRequest.getHeaders.containsKey(ContextHTTPConstant.CONTEXT_ID_STR))
{
+ params.putIfAbsent(ContextHTTPConstant.CONTEXT_ID_STR,
gatewayContext.getRequest.getHeaders.get(ContextHTTPConstant.CONTEXT_ID_STR)(0))
+ }
+ if (null == params || params.isEmpty) {
+ dealContextCreate(gatewayContext)
+ } else {
+ var contextId : String = null
+ for ((key, value) <- params) {
+ if (key.equalsIgnoreCase(ContextHTTPConstant.CONTEXT_ID_STR)) {
+ contextId = value
+ }
+ }
+ if (StringUtils.isNotBlank(contextId)) {
+ dealContextAccess(contextId.toString, gatewayContext)
+ } else {
+ dealContextCreate(gatewayContext)
+ }
+ }
+ }else{
+ null
+ }
+ }
+ //after modification
+ override def route(gatewayContext: GatewayContext): ServiceInstance = {
+
+ if (
+ gatewayContext.getGatewayRoute.getRequestURI.contains(
+ RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX
+ )
+ ) {
+ val params: util.HashMap[String, String] =
gatewayContext.getGatewayRoute.getParams
+ if (!gatewayContext.getRequest.getQueryParams.isEmpty) {
+ for ((k, vArr) <- gatewayContext.getRequest.getQueryParams.asScala) {
+ if (vArr.nonEmpty) {
+ params.putIfAbsent(k, vArr.head)
+ }
+ }
+ }
+ if
(gatewayContext.getRequest.getHeaders.containsKey(ContextHTTPConstant.CONTEXT_ID_STR))
{
+ params.putIfAbsent(
+ ContextHTTPConstant.CONTEXT_ID_STR,
+
gatewayContext.getRequest.getHeaders.get(ContextHTTPConstant.CONTEXT_ID_STR)(0)
+ )
+ }
+ if (null == params || params.isEmpty) {
+ dealContextCreate(gatewayContext)
+ } else {
+ var contextId: String = null
+ for ((key, value) <- params.asScala) {
+ if (key.equalsIgnoreCase(ContextHTTPConstant.CONTEXT_ID_STR)) {
+ contextId = value
+ }
+ }
+ if (StringUtils.isNotBlank(contextId)) {
+ dealContextAccess(contextId, gatewayContext)
+ } else {
+ dealContextCreate(gatewayContext)
+ }
+ }
+ } else {
+ null
+ }
+ }
+
+
+ // before modification
+ def dealContextCreate(gatewayContext:GatewayContext):ServiceInstance = {
+ val serviceId = findService(HaContextGatewayRouter.CONTEXT_SERVICE_STR,
list => {
+ val services =
list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR))
+ services.headOption
+ })
+ val serviceInstances =
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (serviceInstances.size > 0) {
+ val index = new Random().nextInt(serviceInstances.size)
+ serviceInstances(index)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+ //after modification
+ def dealContextCreate(gatewayContext: GatewayContext): ServiceInstance = {
+ val serviceId = findService(
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
+ list => {
+ val services =
list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
+ services.headOption
+ }
+ )
+ val serviceInstances =
+
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (serviceInstances.size > 0) {
+ val index = new Random().nextInt(serviceInstances.size)
+ serviceInstances(index)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+
+ // before modification
+ def dealContextAccess(contextIdStr:String, gatewayContext:
GatewayContext):ServiceInstance = {
+ val contextId : String = {
+ var tmpId : String = null
+ if (serializationHelper.accepts(contextIdStr)) {
+ val contextID : ContextID =
serializationHelper.deserialize(contextIdStr).asInstanceOf[ContextID]
+ if (null != contextID) {
+ tmpId = contextID.getContextId
+ } else {
+ logger.error(s"Deserializate contextID null. contextIDStr : " +
contextIdStr)
+ }
+ } else {
+ logger.error(s"ContxtIDStr cannot be deserialized. contextIDStr : " +
contextIdStr)
+ }
+ if (null == tmpId) {
+ contextIdStr
+ } else {
+ tmpId
+ }
+ }
+ val instances = contextIDParser.parse(contextId)
+ var serviceId:Option[String] = None
+ serviceId = findService(HaContextGatewayRouter.CONTEXT_SERVICE_STR, list
=> {
+ val services =
list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR))
+ services.headOption
+ })
+ val serviceInstances =
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (instances.size() > 0) {
+ serviceId.map(ServiceInstance(_, instances.get(0))).orNull
+ } else if (serviceInstances.size > 0) {
+ serviceInstances(0)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+
+}
+//after modification
+def dealContextAccess(contextIdStr: String, gatewayContext: GatewayContext):
ServiceInstance = {
+ val contextId: String = {
+ var tmpId: String = null
+ if (serializationHelper.accepts(contextIdStr)) {
+ val contextID: ContextID =
+ serializationHelper.deserialize(contextIdStr).asInstanceOf[ContextID]
+ if (null != contextID) {
+ tmpId = contextID.getContextId
+ } else {
+ logger.error(s"Deserializate contextID null. contextIDStr : " +
contextIdStr)
+ }
+ } else {
+ logger.error(s"ContxtIDStr cannot be deserialized. contextIDStr : " +
contextIdStr)
+ }
+ if (null == tmpId) {
+ contextIdStr
+ } else {
+ tmpId
+ }
+ }
+ val instances = contextIDParser.parse(contextId)
+ var serviceId: Option[String] = None
+ serviceId = findService(
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
+ list => {
+ val services =
list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
+ services.headOption
+ }
+ )
+ val serviceInstances =
+
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (instances.size() > 0) {
+ serviceId.map(ServiceInstance(_, instances.get(0))).orNull
+ } else if (serviceInstances.size > 0) {
+ serviceInstances(0)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+
+// before modification
+object HaContextGatewayRouter{
+ val CONTEXT_ID_STR:String = "contextId"
+ val CONTEXT_SERVICE_STR:String = "ps-cs"
+ @Deprecated
+ val OLD_CONTEXT_SERVICE_PREFIX = "contextservice"
+ val CONTEXT_REGEX: Regex = (normalPath(API_URL_PREFIX) +
"rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r
+}
+//after modification
+object HaContextGatewayRouter {
+
+ val CONTEXT_ID_STR: String = "contextId"
+
+ @deprecated("please use RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX")
+ val CONTEXT_SERVICE_REQUEST_PREFIX =
RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX
+
+ @deprecated("please use RPCConfiguration.CONTEXT_SERVICE_NAME")
+ val CONTEXT_SERVICE_NAME: String =
+ if (
+ RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue &&
RPCConfiguration.PUBLIC_SERVICE_LIST
+
.exists(_.equalsIgnoreCase(RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX))
+ ) {
+ RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
+ } else {
+ RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue
+ }
+
+ val CONTEXT_REGEX: Regex =
+ (normalPath(API_URL_PREFIX) +
"rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r
+
+}
+```
+
+#### RPC Service Change（org.apache.linkis.rpc.conf.RPCConfiguration）
+```scala
+//before modification
+val BDP_RPC_BROADCAST_THREAD_SIZE: CommonVars[Integer] =
CommonVars("wds.linkis.rpc.broadcast.thread.num", new Integer(25))
+//after modification
+val BDP_RPC_BROADCAST_THREAD_SIZE: CommonVars[Integer] =
CommonVars("wds.linkis.rpc.broadcast.thread.num", 25)
+
+//before modification
+val PUBLIC_SERVICE_LIST: Array[String] =
CommonVars("wds.linkis.gateway.conf.publicservice.list",
"query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource").getValue
.split(",")
+//after change
+val PUBLIC_SERVICE_LIST: Array[String] =
CommonVars("wds.linkis.gateway.conf.publicservice.list",
"cs,contextservice,data-source-manager,metadataquery,metadatamanager,
query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource").getValue.split(",")
+
+```
+#### Configuration file changes
+```yaml
+##Remove part #Delete the
+
+following configuration files
+linkis-dist/package/conf/linkis-ps-cs.properties
+linkis-dist/package/conf/linkis-ps-data-source-manager.properties
+linkis-dist/package/conf/linkis-ps-metadataquery.properties
+
+##modified part
+
+#modify linkis-dist/package/conf/linkis-ps-publicservice.properties
+#restful before modification
+wds.linkis.server.restful.scan.packages=org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server.restful,org.apache.linkis.bml.restful,org.apache.linkis.errorcode.server.restful
+
+#restful after modification
+wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server
[...]
+
+#mybatis before modification
+wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xml,org/apache/linkis/metadata/dao/impl/*.xml,classpath:org/apache/linkis/bml/dao/impl/*.xml
+
+wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
+
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+
+#mybatis after modification
+wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xm
[...]
+
+wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
+
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.
variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.
apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+```
+
+#### Deployment script changes (linkis-dist/package/sbin/linkis-start-all.sh)
+```shell #Service
+startup script remove the following part
+
+#linkis-ps-cs
+SERVER_NAME="ps-cs"
+SERVER_IP=$CS_INSTALL_IP
+startApp
+
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+ startApp
+
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
+ startApp
+fi
+
+#linkis-ps-cs
+SERVER_NAME="ps-cs"
+SERVER_IP=$CS_INSTALL_IP
+checkServer
+
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+ checkServer
+
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
+ checkServer
+fi
+
+
+#Service stop script remove the following part
+#linkis-ps-cs
+SERVER_NAME="ps-cs"
+SERVER_IP=$CS_INSTALL_IP
+stopApp
+
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME ="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+ stopApp
+
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
+ stopApp
+fi
+
+```
+For more details on service merge changes, see: https://github
.com/apache/incubator-linkis/pull/2927/files
\ No newline at end of file
diff --git a/blog/authors.yml b/blog/authors.yml
index a8402f0bd0..99a7b33207 100644
--- a/blog/authors.yml
+++ b/blog/authors.yml
@@ -10,6 +10,12 @@ peacewong:
url: https://github.com/peacewong/
image_url: https://avatars.githubusercontent.com/u/11496700?v=4
+aiceflower:
+ name: aiceflower
+ title: Development Engineer of WeBank
+ url: https://github.com/aiceflower/
+ image_url: https://avatars.githubusercontent.com/u/22620332?s=400&v=4
+
BeaconTown:
name: BeaconTown
title: Student
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-blog/2022-10-09-linkis-service-merge.md
b/i18n/zh-CN/docusaurus-plugin-content-blog/2022-10-09-linkis-service-merge.md
new file mode 100644
index 0000000000..bc8e5312a3
--- /dev/null
+++
b/i18n/zh-CN/docusaurus-plugin-content-blog/2022-10-09-linkis-service-merge.md
@@ -0,0 +1,362 @@
+---
+title: Apache Linkis1.3.0 Service Merge
+authors: [aiceflower]
+tags: [blog,linki1.3.0,service merge]
+---
+### 前言
+
+随着业务的发展和社区产品的更新迭代，我们发现Linkis1.X服务过多，可以适当进行服务合并，减少服务数量，方便部署和调试。目前Linkis服务主要分为三大类，包括计算治理服务（CG:
entrance/ecp/ecm/linkismanager）、公共增强服务（PS:publicservice/datasource/cs）和微服务治理服务（MG：Gateway/Eureka）。这三类服务延伸的子服务过多，可以进行服务合并，做到将PS的服务全部合并，CG服务支持全部合并，同时支持将ecm服务单独出去。
+
+### 服务合并变动
+
+本次服务合并主要变动如下：
+
+-
支持Restful服务转发：修改点主要为Gateway的转发逻辑，类似于现在publicservice服务合并参数：wds.linkis.gateway.conf.publicservice.list
+- 支持将RPC服务远程调用改为本地调用，类似LocalMessageSender，现在已经可以通过改Sender完成本地调用的返回
+- 配置文件变动
+- 服务启停脚本变动
+
+### 待实现目标
+
+- 基本目标：合并PS服务为一个服务
+- 基本目标：合并CG服务为CG-Service和ECM
+- 进阶目标：合并CG服务为一个服
+- 终结目标：去掉eureka、gateway变为单体服务
+
+
+### 具体变动
+
+#### Gateway变动（org.apache.linkis.gateway.ujes.route.HaContextGatewayRouter）
+
+```scala
+//变动前
+override def route(gatewayContext: GatewayContext): ServiceInstance = {
+
+ if
(gatewayContext.getGatewayRoute.getRequestURI.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR)
||
+
gatewayContext.getGatewayRoute.getRequestURI.contains(HaContextGatewayRouter.OLD_CONTEXT_SERVICE_PREFIX)){
+ val params: util.HashMap[String, String] =
gatewayContext.getGatewayRoute.getParams
+ if (!gatewayContext.getRequest.getQueryParams.isEmpty) {
+ for ((k, vArr) <- gatewayContext.getRequest.getQueryParams) {
+ if (vArr.nonEmpty) {
+ params.putIfAbsent(k, vArr.head)
+ }
+ }
+ }
+ if
(gatewayContext.getRequest.getHeaders.containsKey(ContextHTTPConstant.CONTEXT_ID_STR))
{
+ params.putIfAbsent(ContextHTTPConstant.CONTEXT_ID_STR,
gatewayContext.getRequest.getHeaders.get(ContextHTTPConstant.CONTEXT_ID_STR)(0))
+ }
+ if (null == params || params.isEmpty) {
+ dealContextCreate(gatewayContext)
+ } else {
+ var contextId : String = null
+ for ((key, value) <- params) {
+ if (key.equalsIgnoreCase(ContextHTTPConstant.CONTEXT_ID_STR)) {
+ contextId = value
+ }
+ }
+ if (StringUtils.isNotBlank(contextId)) {
+ dealContextAccess(contextId.toString, gatewayContext)
+ } else {
+ dealContextCreate(gatewayContext)
+ }
+ }
+ }else{
+ null
+ }
+ }
+ //变动后
+ override def route(gatewayContext: GatewayContext): ServiceInstance = {
+
+ if (
+ gatewayContext.getGatewayRoute.getRequestURI.contains(
+ RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX
+ )
+ ) {
+ val params: util.HashMap[String, String] =
gatewayContext.getGatewayRoute.getParams
+ if (!gatewayContext.getRequest.getQueryParams.isEmpty) {
+ for ((k, vArr) <- gatewayContext.getRequest.getQueryParams.asScala) {
+ if (vArr.nonEmpty) {
+ params.putIfAbsent(k, vArr.head)
+ }
+ }
+ }
+ if
(gatewayContext.getRequest.getHeaders.containsKey(ContextHTTPConstant.CONTEXT_ID_STR))
{
+ params.putIfAbsent(
+ ContextHTTPConstant.CONTEXT_ID_STR,
+
gatewayContext.getRequest.getHeaders.get(ContextHTTPConstant.CONTEXT_ID_STR)(0)
+ )
+ }
+ if (null == params || params.isEmpty) {
+ dealContextCreate(gatewayContext)
+ } else {
+ var contextId: String = null
+ for ((key, value) <- params.asScala) {
+ if (key.equalsIgnoreCase(ContextHTTPConstant.CONTEXT_ID_STR)) {
+ contextId = value
+ }
+ }
+ if (StringUtils.isNotBlank(contextId)) {
+ dealContextAccess(contextId, gatewayContext)
+ } else {
+ dealContextCreate(gatewayContext)
+ }
+ }
+ } else {
+ null
+ }
+ }
+
+
+ //变动前
+ def dealContextCreate(gatewayContext:GatewayContext):ServiceInstance = {
+ val serviceId = findService(HaContextGatewayRouter.CONTEXT_SERVICE_STR,
list => {
+ val services =
list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR))
+ services.headOption
+ })
+ val serviceInstances =
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (serviceInstances.size > 0) {
+ val index = new Random().nextInt(serviceInstances.size)
+ serviceInstances(index)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+ //变动后
+ def dealContextCreate(gatewayContext: GatewayContext): ServiceInstance = {
+ val serviceId = findService(
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
+ list => {
+ val services =
list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
+ services.headOption
+ }
+ )
+ val serviceInstances =
+
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (serviceInstances.size > 0) {
+ val index = new Random().nextInt(serviceInstances.size)
+ serviceInstances(index)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+
+ //变动前
+ def dealContextAccess(contextIdStr:String, gatewayContext:
GatewayContext):ServiceInstance = {
+ val contextId : String = {
+ var tmpId : String = null
+ if (serializationHelper.accepts(contextIdStr)) {
+ val contextID : ContextID =
serializationHelper.deserialize(contextIdStr).asInstanceOf[ContextID]
+ if (null != contextID) {
+ tmpId = contextID.getContextId
+ } else {
+ logger.error(s"Deserializate contextID null. contextIDStr : " +
contextIdStr)
+ }
+ } else {
+ logger.error(s"ContxtIDStr cannot be deserialized. contextIDStr : " +
contextIdStr)
+ }
+ if (null == tmpId) {
+ contextIdStr
+ } else {
+ tmpId
+ }
+ }
+ val instances = contextIDParser.parse(contextId)
+ var serviceId:Option[String] = None
+ serviceId = findService(HaContextGatewayRouter.CONTEXT_SERVICE_STR, list
=> {
+ val services =
list.filter(_.contains(HaContextGatewayRouter.CONTEXT_SERVICE_STR))
+ services.headOption
+ })
+ val serviceInstances =
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (instances.size() > 0) {
+ serviceId.map(ServiceInstance(_, instances.get(0))).orNull
+ } else if (serviceInstances.size > 0) {
+ serviceInstances(0)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+
+}
+//变动后
+def dealContextAccess(contextIdStr: String, gatewayContext: GatewayContext):
ServiceInstance = {
+ val contextId: String = {
+ var tmpId: String = null
+ if (serializationHelper.accepts(contextIdStr)) {
+ val contextID: ContextID =
+ serializationHelper.deserialize(contextIdStr).asInstanceOf[ContextID]
+ if (null != contextID) {
+ tmpId = contextID.getContextId
+ } else {
+ logger.error(s"Deserializate contextID null. contextIDStr : " +
contextIdStr)
+ }
+ } else {
+ logger.error(s"ContxtIDStr cannot be deserialized. contextIDStr : " +
contextIdStr)
+ }
+ if (null == tmpId) {
+ contextIdStr
+ } else {
+ tmpId
+ }
+ }
+ val instances = contextIDParser.parse(contextId)
+ var serviceId: Option[String] = None
+ serviceId = findService(
+ RPCConfiguration.CONTEXT_SERVICE_NAME,
+ list => {
+ val services =
list.filter(_.contains(RPCConfiguration.CONTEXT_SERVICE_NAME))
+ services.headOption
+ }
+ )
+ val serviceInstances =
+
ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId.orNull)
+ if (instances.size() > 0) {
+ serviceId.map(ServiceInstance(_, instances.get(0))).orNull
+ } else if (serviceInstances.size > 0) {
+ serviceInstances(0)
+ } else {
+ logger.error(s"No valid instance for service : " + serviceId.orNull)
+ null
+ }
+ }
+
+//变动前
+object HaContextGatewayRouter{
+ val CONTEXT_ID_STR:String = "contextId"
+ val CONTEXT_SERVICE_STR:String = "ps-cs"
+ @Deprecated
+ val OLD_CONTEXT_SERVICE_PREFIX = "contextservice"
+ val CONTEXT_REGEX: Regex = (normalPath(API_URL_PREFIX) +
"rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r
+}
+//变动后
+object HaContextGatewayRouter {
+
+ val CONTEXT_ID_STR: String = "contextId"
+
+ @deprecated("please use RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX")
+ val CONTEXT_SERVICE_REQUEST_PREFIX =
RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX
+
+ @deprecated("please use RPCConfiguration.CONTEXT_SERVICE_NAME")
+ val CONTEXT_SERVICE_NAME: String =
+ if (
+ RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue &&
RPCConfiguration.PUBLIC_SERVICE_LIST
+
.exists(_.equalsIgnoreCase(RPCConfiguration.CONTEXT_SERVICE_REQUEST_PREFIX))
+ ) {
+ RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
+ } else {
+ RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue
+ }
+
+ val CONTEXT_REGEX: Regex =
+ (normalPath(API_URL_PREFIX) +
"rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r
+
+}
+```
+
+#### RPC服务变动（org.apache.linkis.rpc.conf.RPCConfiguration）
+```scala
+//变动前
+val BDP_RPC_BROADCAST_THREAD_SIZE: CommonVars[Integer] =
CommonVars("wds.linkis.rpc.broadcast.thread.num", new Integer(25))
+//变动后
+val BDP_RPC_BROADCAST_THREAD_SIZE: CommonVars[Integer] =
CommonVars("wds.linkis.rpc.broadcast.thread.num", 25)
+
+//变动前
+val PUBLIC_SERVICE_LIST: Array[String] =
CommonVars("wds.linkis.gateway.conf.publicservice.list",
"query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource").getValue.split(",")
+//变动后
+val PUBLIC_SERVICE_LIST: Array[String] =
CommonVars("wds.linkis.gateway.conf.publicservice.list",
"cs,contextservice,data-source-manager,metadataquery,metadatamanager,query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource").getValue.split(",")
+
+```
+#### 配置文件变动
+```yaml
+##去除部分
+
+#删除如下配置文件
+linkis-dist/package/conf/linkis-ps-cs.properties
+linkis-dist/package/conf/linkis-ps-data-source-manager.properties
+linkis-dist/package/conf/linkis-ps-metadataquery.properties
+
+##修改部分
+
+#修改linkis-dist/package/conf/linkis-ps-publicservice.properties
+#restful修改前
+wds.linkis.server.restful.scan.packages=org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server.restful,org.apache.linkis.bml.restful,org.apache.linkis.errorcode.server.restful
+
+#restful修改后
+wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server
[...]
+
+#mybatis修改前
+wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xml,org/apache/linkis/metadata/dao/impl/*.xml,classpath:org/apache/linkis/bml/dao/impl/*.xml
+
+wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
+
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+
+#mybatis修改后
+wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xm
[...]
+
+wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
+
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+```
+
+#### 部署脚本变动（linkis-dist/package/sbin/linkis-start-all.sh）
+```shell
+#服务启动脚本去掉如下部分
+
+#linkis-ps-cs
+SERVER_NAME="ps-cs"
+SERVER_IP=$CS_INSTALL_IP
+startApp
+
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+ startApp
+
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
+ startApp
+fi
+
+#linkis-ps-cs
+SERVER_NAME="ps-cs"
+SERVER_IP=$CS_INSTALL_IP
+checkServer
+
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+ checkServer
+
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
+ checkServer
+fi
+
+
+#服务停止脚本去掉如下部分
+#linkis-ps-cs
+SERVER_NAME="ps-cs"
+SERVER_IP=$CS_INSTALL_IP
+stopApp
+
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
+ #linkis-ps-data-source-manager
+ SERVER_NAME="ps-data-source-manager"
+ SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
+ stopApp
+
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
+ stopApp
+fi
+
+```
+更多服务合并变动细节参见：https://github.com/apache/incubator-linkis/pull/2927/files
diff --git a/i18n/zh-CN/docusaurus-plugin-content-blog/authors.yml
b/i18n/zh-CN/docusaurus-plugin-content-blog/authors.yml
index 1e061d9a0d..4fe6718d8b 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-blog/authors.yml
+++ b/i18n/zh-CN/docusaurus-plugin-content-blog/authors.yml
@@ -10,6 +10,12 @@ peacewong:
url: https://github.com/peacewong/
image_url: https://avatars.githubusercontent.com/u/11496700?v=4
+aiceflower:
+ name: aiceflower
+ title: 微众银行开发工程师
+ url: https://github.com/aiceflower/
+ image_url: https://avatars.githubusercontent.com/u/22620332?s=400&v=4
+
BeaconTown:
name: BeaconTown
title: 学生
@@ -32,4 +38,5 @@ kevinWdong:
name: kevinWdong
title: contributors
url: https://github.com/kongslove
- image_url: https://avatars.githubusercontent.com/u/42604208?v=4
\ No newline at end of file
+ image_url: https://avatars.githubusercontent.com/u/42604208?v=4
+
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
